diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
index ba5b3e59d8af3f4d945d39462a71179a016d04d5..a461656e533d39b1b8f82f0cd45ddfbdf377ff08 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
@@ -1058,4 +1058,8 @@ public class ConversationActivity extends XmppActivity
 	public void blockConversation(final Blockable conversation) {
 		xmppConnectionService.sendBlockRequest(conversation);
 	}
+
+	public boolean enterIsSend() {
+		return getPreferences().getBoolean("enter_is_send",false);
+	}
 }
diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
index 93a4cc7ef5ba879be0d1123de74a01835b02eb8a..5eb81e64eab5b0424c43fbdec88411608a4e56f4 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
@@ -316,8 +316,13 @@ public class ConversationFragment extends Fragment {
 		mEditMessage.setOnEnterPressedListener(new OnEnterPressed() {
 
 			@Override
-			public void onEnterPressed() {
-				sendMessage();
+			public boolean onEnterPressed() {
+				if (activity.enterIsSend()) {
+					sendMessage();
+					return true;
+				} else {
+					return false;
+				}
 			}
 		});
 
diff --git a/src/main/java/eu/siacs/conversations/ui/EditMessage.java b/src/main/java/eu/siacs/conversations/ui/EditMessage.java
index f830205068cc3ebe8bc3174e4134e6a3b2904ec8..5090bbf53da311286ea2f889b24ad904df247ce2 100644
--- a/src/main/java/eu/siacs/conversations/ui/EditMessage.java
+++ b/src/main/java/eu/siacs/conversations/ui/EditMessage.java
@@ -21,9 +21,12 @@ public class EditMessage extends EditText {
 	public boolean onKeyDown(int keyCode, KeyEvent event) {
 		if (keyCode == KeyEvent.KEYCODE_ENTER) {
 			if (mOnEnterPressed != null) {
-				mOnEnterPressed.onEnterPressed();
+				if (mOnEnterPressed.onEnterPressed()) {
+					return true;
+				} else {
+					return super.onKeyDown(keyCode, event);
+				}
 			}
-			return true;
 		}
 		return super.onKeyDown(keyCode, event);
 	}
@@ -33,7 +36,7 @@ public class EditMessage extends EditText {
 	}
 
 	public interface OnEnterPressed {
-		public void onEnterPressed();
+		public boolean onEnterPressed();
 	}
 
 }
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 9cb60cf8373df9987a8f91b398aed145ad8fb0e1..31f4dbea32570033105524050937d30c64744b87 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -434,4 +434,7 @@
 	<string name="two_hours">2 hours</string>
 	<string name="eight_hours">8 hours</string>
 	<string name="until_further_notice">Until further notice</string>
+	<string name="pref_input_options">Input options</string>
+	<string name="pref_enter_is_send">Enter is send</string>
+	<string name="pref_enter_is_send_summary">Use enter key to send message</string>
 </resources>
diff --git a/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml
index 9974f14d410680a1513a8a386a13cbbef4b91385..3f18512b8ed5f87e765151286fe210c94832484d 100644
--- a/src/main/res/xml/preferences.xml
+++ b/src/main/res/xml/preferences.xml
@@ -122,6 +122,13 @@
                     android:summary="@string/pref_enable_legacy_ssl_summary"
                     android:title="@string/pref_enable_legacy_ssl" />
             </PreferenceCategory>
+	        <PreferenceCategory android:title="@string/pref_input_options">
+		        <CheckBoxPreference
+			        android:defaultValue="false"
+			        android:key="enter_is_send"
+			        android:title="@string/pref_enter_is_send"
+			        android:summary="@string/pref_enter_is_send_summary" />
+	        </PreferenceCategory>
             <PreferenceCategory android:title="@string/pref_expert_options_other" >
                 <CheckBoxPreference
                     android:defaultValue="false"