diff --git a/src/ui/android/src/org/grammaticalframework/ui/android/ConversationView.java b/src/ui/android/src/org/grammaticalframework/ui/android/ConversationView.java
index a69821528..cb202725c 100644
--- a/src/ui/android/src/org/grammaticalframework/ui/android/ConversationView.java
+++ b/src/ui/android/src/org/grammaticalframework/ui/android/ConversationView.java
@@ -81,6 +81,8 @@ public class ConversationView extends ScrollView {
         edittext.setText(text);
         edittext.setOnEditorActionListener(mEditorListener);
         edittext.setOnClickListener(mEditorListener);
+        edittext.setHorizontallyScrolling(false);
+        edittext.setMaxLines(Integer.MAX_VALUE);
         Bundle extras = edittext.getInputExtras(true);
         extras.putBoolean("show_language_toggle", false);
         mContent.addView(edittext);