From ad8da9f0c64c53503c39bb693ce57b770c69e87a Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Mon, 10 May 2021 07:36:40 +0200
Subject: [PATCH] Improved auto pos

---
 .../java/eu/faircode/email/FragmentCompose.java  | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index 5c9055764d..94f45fbde6 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -5653,9 +5653,6 @@ public class FragmentCompose extends FragmentBase {
     }
 
     private int getAutoPos(int start, int end) {
-        if (!BuildConfig.DEBUG)
-            return -1;
-
         if (start > end || end == 0)
             return -1;
 
@@ -5663,14 +5660,21 @@ public class FragmentCompose extends FragmentBase {
         if (text == null)
             return -1;
 
+        int lc = 0;
         int nl = 0;
         int pos = 0;
         String[] lines = text.subSequence(start, end).toString().split("\n");
-        for (int i = 0; i < Math.min(5, lines.length); i++) {
+        for (int i = 0; i < lines.length; i++) {
             if (TextUtils.isEmpty(lines[i]))
                 nl++;
-            if (nl == 2)
-                return start + pos;
+            else {
+                lc++;
+                nl = 0;
+            }
+            if (lc > 1)
+                return -1;
+            if (nl > 2)
+                return start + pos - 1;
             pos += lines[i].length() + 1;
         }
         return -1;