diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index 6fa2dace98..cc799c30f5 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -670,7 +670,7 @@ public class FragmentCompose extends FragmentBase {
                     char b = text.charAt(index - 1);
 
                     save = (auto_save_paragraph && c == '\n' && b != '\n') ||
-                            (auto_save_dot && Helper.isDot(c) && !Helper.isDot(b));
+                            (auto_save_dot && Helper.isEndChar(c) && !Helper.isEndChar(b));
                     if (save)
                         Log.i("Save=" + index);
 
diff --git a/app/src/main/java/eu/faircode/email/Helper.java b/app/src/main/java/eu/faircode/email/Helper.java
index f0c7c67789..214275f2d0 100644
--- a/app/src/main/java/eu/faircode/email/Helper.java
+++ b/app/src/main/java/eu/faircode/email/Helper.java
@@ -2329,8 +2329,11 @@ public class Helper {
         };
     }
 
-    static boolean isDot(char c) {
-        return (c == '.' /* Latin */ || c == '。' /* Chinese */);
+    static boolean isEndChar(char c) {
+        return (c == '.' /* Latin */ ||
+                c == '。' /* Chinese */ ||
+                c == ':' || c == ';' ||
+                c == '?' || c == '!');
     }
 
     static String trim(String value, String chars) {