diff --git a/src/com/fsck/k9/helper/Utility.java b/src/com/fsck/k9/helper/Utility.java
index e0a7ae1df..5249ab138 100644
--- a/src/com/fsck/k9/helper/Utility.java
+++ b/src/com/fsck/k9/helper/Utility.java
@@ -508,7 +508,8 @@ public class Utility
                 }
             }
         }
-        if (tagStripped)
+        // Null pointer check is to make the static analysis component of Eclipse happy.
+        if (tagStripped && (tag != null))
         {
             // restore the last tag
             lastPrefix -= tag.length();