diff --git a/app/src/main/java/eu/faircode/email/EditTextCompose.java b/app/src/main/java/eu/faircode/email/EditTextCompose.java
index a62f5964c4..b34ce28758 100644
--- a/app/src/main/java/eu/faircode/email/EditTextCompose.java
+++ b/app/src/main/java/eu/faircode/email/EditTextCompose.java
@@ -235,7 +235,17 @@ public class EditTextCompose extends FixedEditText {
                                                     int start = getSelectionStart();
                                                     if (start < 0)
                                                         start = 0;
-                                                    getText().insert(start, ssb);
+
+                                                    Editable edit = getText();
+
+                                                    if (start > 0) {
+                                                        char kar = edit.charAt(start - 1);
+                                                        if (!(kar == '\n' || kar == ' '))
+                                                            edit.insert(start++, " ");
+                                                    }
+
+                                                    edit.insert(start, ssb);
+
                                                     setSelection(start + ssb.length());
                                                 } catch (Throwable ex) {
                                                     Log.e(ex);