diff --git a/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java b/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java
index 407d7d16c1..fb1f15543d 100644
--- a/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java
+++ b/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java
@@ -428,7 +428,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
         expandedKeyboardHeight = height;
       }
       collapsedKeyboardHeight = Math.min(collapsedKeyboardHeight, height);
-      keyboardHeight = Math.max(expandedKeyboardHeight - collapsedKeyboardHeight, keyboardHeight);
+      keyboardHeight = expandedKeyboardHeight - collapsedKeyboardHeight;
     });
   }