diff --git a/src/org/thoughtcrime/securesms/components/ComposeText.java b/src/org/thoughtcrime/securesms/components/ComposeText.java
index 1c3b31d56..8fa9c88c7 100644
--- a/src/org/thoughtcrime/securesms/components/ComposeText.java
+++ b/src/org/thoughtcrime/securesms/components/ComposeText.java
@@ -100,7 +100,8 @@ public class ComposeText extends EmojiEditText {
   }
 
   public void setTransport(TransportOption transport) {
-    final boolean useSystemEmoji = Prefs.isSystemEmojiPreferred(getContext());
+    // do not add InputType.TYPE_TEXT_VARIATION_SHORT_MESSAGE
+    // as this removes the ability to compose multi-line messages.
 
     int imeOptions = (getImeOptions() & ~EditorInfo.IME_MASK_ACTION) | EditorInfo.IME_ACTION_SEND;
     int inputType  = getInputType();
@@ -108,10 +109,6 @@ public class ComposeText extends EmojiEditText {
     if (isLandscape()) setImeActionLabel(getContext().getString(R.string.menu_send), EditorInfo.IME_ACTION_SEND);
     else               setImeActionLabel(null, 0);
 
-    if (useSystemEmoji) {
-      inputType = (inputType & ~InputType.TYPE_MASK_VARIATION) | InputType.TYPE_TEXT_VARIATION_SHORT_MESSAGE;
-    }
-
     setInputType(inputType);
     setImeOptions(imeOptions);
     setHint(transport.getComposeHint(),null);