diff --git a/app/src/main/java/eu/faircode/email/MessageHelper.java b/app/src/main/java/eu/faircode/email/MessageHelper.java
index b4f06ca024..e51c3f6235 100644
--- a/app/src/main/java/eu/faircode/email/MessageHelper.java
+++ b/app/src/main/java/eu/faircode/email/MessageHelper.java
@@ -1319,23 +1319,22 @@ public class MessageHelper {
         // https://tools.ietf.org/html/rfc2047
         // encoded-word = "=?" charset "?" encoding "?" encoded-text "?="
 
-        int i = 0;
+        int s, q1, q2, e, i = 0;
         List<MimeTextPart> parts = new ArrayList<>();
-
         while (i < text.length()) {
-            int s = text.indexOf("=?", i);
+            s = text.indexOf("=?", i);
             if (s < 0)
                 break;
 
-            int q1 = text.indexOf("?", s + 2);
+            q1 = text.indexOf("?", s + 2);
             if (q1 < 0)
                 break;
 
-            int q2 = text.indexOf("?", q1 + 1);
+            q2 = text.indexOf("?", q1 + 1);
             if (q2 < 0)
                 break;
 
-            int e = text.indexOf("?=", q2 + 1);
+            e = text.indexOf("?=", q2 + 1);
             if (e < 0)
                 break;