diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
index 0b4608ba..1c1fcb75 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
@@ -10,6 +10,7 @@ import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.IntentSender.SendIntentException;
 import android.os.Bundle;
+import android.os.Handler;
 import android.support.annotation.Nullable;
 import android.text.InputType;
 import android.view.ContextMenu;
@@ -956,10 +957,15 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
 	}
 
 	private void messageSent() {
-		int size = this.messageList.size();
-		messagesView.setSelection(size - 1);
 		mEditMessage.setText("");
 		updateChatMsgHint();
+		new Handler().post(new Runnable() {
+			@Override
+			public void run() {
+				int size = messageList.size();
+				messagesView.setSelection(size - 1);
+			}
+		});
 	}
 
 	public void setFocusOnInputField() {