diff --git a/src/com/fsck/k9/mail/internet/EncoderUtil.java b/src/com/fsck/k9/mail/internet/EncoderUtil.java
index 2665ee7e8..c5e8bf667 100644
--- a/src/com/fsck/k9/mail/internet/EncoderUtil.java
+++ b/src/com/fsck/k9/mail/internet/EncoderUtil.java
@@ -130,8 +130,8 @@ public class EncoderUtil {
     private static int qEncodedLength(byte[] bytes) {
         int count = 0;
 
-        for (int idx = 0; idx < bytes.length; idx++) {
-            int v = bytes[idx] & 0xff;
+        for (byte b : bytes) {
+            int v = b & 0xff;
             if (v == 32) {
                 count++;
             } else if (!Q_RESTRICTED_CHARS.get(v)) {