diff --git a/app/src/main/java/de/kuschku/quasseldroid/settings/AppearanceSettings.kt b/app/src/main/java/de/kuschku/quasseldroid/settings/AppearanceSettings.kt
index a658b421c35ab8da2a158ef5cc37656a21519fc4..e433e8fd38b5fdeff1fa285bdc6f63d4f024485c 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/settings/AppearanceSettings.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/settings/AppearanceSettings.kt
@@ -23,7 +23,7 @@ import androidx.annotation.StyleRes
 import de.kuschku.quasseldroid.R
 
 data class AppearanceSettings(
-  val inputEnter: InputEnterMode = InputEnterMode.EMOJI,
+  val inputEnter: InputEnterMode = InputEnterMode.NEWLINE,
   val showLag: Boolean = true,
   val theme: Theme = Theme.MATERIAL_LIGHT,
   val language: String = "",
@@ -31,7 +31,8 @@ data class AppearanceSettings(
 ) {
   enum class InputEnterMode {
     EMOJI,
-    SEND;
+    SEND,
+    NEWLINE;
 
     companion object {
       private val map = values().associateBy { it.name }
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/input/EditorHelper.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/input/EditorHelper.kt
index 4a012dcd1495e2f1f72ef6917d1639e1b9be0b0d..cf3880b322be53a7d8465da3967238b3a78520f9 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/input/EditorHelper.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/input/EditorHelper.kt
@@ -172,14 +172,18 @@ class EditorHelper(
     }
 
     editText.imeOptions = when (appearanceSettings.inputEnter) {
-      AppearanceSettings.InputEnterMode.EMOJI -> listOf(
+      AppearanceSettings.InputEnterMode.EMOJI   -> listOf(
         EditorInfo.IME_ACTION_NONE,
         EditorInfo.IME_FLAG_NO_EXTRACT_UI
       )
-      AppearanceSettings.InputEnterMode.SEND  -> listOf(
+      AppearanceSettings.InputEnterMode.SEND    -> listOf(
         EditorInfo.IME_ACTION_SEND,
         EditorInfo.IME_FLAG_NO_EXTRACT_UI
       )
+      AppearanceSettings.InputEnterMode.NEWLINE -> listOf(
+        EditorInfo.IME_ACTION_UNSPECIFIED,
+        EditorInfo.IME_FLAG_NO_EXTRACT_UI
+      )
     }.fold(0, Int::or)
   }
 
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/input/RichEditText.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/input/RichEditText.kt
index af0426246222701452a1b79d57188da151000cf4..ab234ac09f20a6dab1197b4f3b35ab750b584d60 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/input/RichEditText.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/input/RichEditText.kt
@@ -290,11 +290,9 @@ class RichEditText : EditTextSelectionChange {
     val selectionStart = selectionStart
     val selectionEnd = selectionEnd
 
-    inputType = if (enabled) {
-      inputType or InputType.TYPE_TEXT_FLAG_MULTI_LINE
-    } else {
-      inputType and InputType.TYPE_TEXT_FLAG_MULTI_LINE.inv()
-    }
+    inputType =
+      if (enabled) inputType or InputType.TYPE_TEXT_FLAG_MULTI_LINE
+      else inputType and InputType.TYPE_TEXT_FLAG_MULTI_LINE.inv()
 
     setSelection(selectionStart, selectionEnd)
   }
diff --git a/app/src/main/res/values/strings_preferences.xml b/app/src/main/res/values/strings_preferences.xml
index 355c870cf55b541f124045441f04861aaeb19da5..63c59b008ab734b5459db4a36a476f88401760a8 100644
--- a/app/src/main/res/values/strings_preferences.xml
+++ b/app/src/main/res/values/strings_preferences.xml
@@ -69,10 +69,12 @@
   <string-array name="preference_input_enter_entries" translatable="false">
     <item>@string/preference_input_enter_entry_emoji</item>
     <item>@string/preference_input_enter_entry_send</item>
+    <item>@string/preference_input_enter_entry_newline</item>
   </string-array>
   <string-array name="preference_input_enter_entryvalues" translatable="false">
     <item>EMOJI</item>
     <item>SEND</item>
+    <item>NEWLINE</item>
   </string-array>
 
   <string name="preference_show_lag_key" translatable="false">show_lag</string>
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index 29c70bd45db9902221724e7368ed2f483f926a64..95fe85d13573ea056975dbd51b7b3e75a0b35e51 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -36,7 +36,7 @@
       android:title="@string/preference_theme_title" />
 
     <DropDownPreference
-      android:defaultValue="EMOJI"
+      android:defaultValue="NEWLINE"
       android:entries="@array/preference_input_enter_entries"
       android:entryValues="@array/preference_input_enter_entryvalues"
       android:key="@string/preference_input_enter_key"