diff --git a/src/main/java/eu/siacs/conversations/ui/EditMessage.java b/src/main/java/eu/siacs/conversations/ui/EditMessage.java
index a58cf2b8b..72975bb76 100644
--- a/src/main/java/eu/siacs/conversations/ui/EditMessage.java
+++ b/src/main/java/eu/siacs/conversations/ui/EditMessage.java
@@ -36,7 +36,7 @@ public class EditMessage extends EditText {
 
 	@Override
 	public boolean onKeyDown(int keyCode, KeyEvent event) {
-		if (keyCode == KeyEvent.KEYCODE_ENTER) {
+		if (keyCode == KeyEvent.KEYCODE_ENTER && !event.isShiftPressed()) {
 			if (keyboardListener != null && keyboardListener.onEnterPressed()) {
 				return true;
 			}