1 files changed, 3 insertions, 1 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/ConversationFragment.java b/src/main/java/de/pixart/messenger/ui/ConversationFragment.java
index d47f8cb72..be6660f53 100644
--- a/src/main/java/de/pixart/messenger/ui/ConversationFragment.java
+++ b/src/main/java/de/pixart/messenger/ui/ConversationFragment.java
@@ -2724,7 +2724,9 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke
             return;
         }
         String previous = this.binding.textinput.getText().toString();
-        if (previous.length() != 0 && !previous.endsWith(" ")) {
+        if (UIHelper.isLastLineQuote(previous)) {
+            text = '\n' + text;
+        } else if (previous.length() != 0 && !Character.isWhitespace(previous.charAt(previous.length() - 1))) {
             text = " " + text;
         }
         this.binding.textinput.append(text);