diff --git a/UI/MailPartViewers/UIxMailPartHTMLViewer.m b/UI/MailPartViewers/UIxMailPartHTMLViewer.m
index d464fbfc2..e0cdb6193 100644
--- a/UI/MailPartViewers/UIxMailPartHTMLViewer.m
+++ b/UI/MailPartViewers/UIxMailPartHTMLViewer.m
@@ -267,7 +267,7 @@ static NSData* _sanitizeContent(NSData *theData)
                   
                   tags = [VoidTags objectEnumerator];
                   tag = [tags nextObject];
-                  while (tag)
+                  while (tag && found_tag)
                     {
                       if ([tag caseInsensitiveCompare: found_tag] == NSOrderedSame)
                         {