diff --git a/UI/MailPartViewers/UIxMailPartHTMLViewer.m b/UI/MailPartViewers/UIxMailPartHTMLViewer.m
index d7dd78e7b..d3c847140 100644
--- a/UI/MailPartViewers/UIxMailPartHTMLViewer.m
+++ b/UI/MailPartViewers/UIxMailPartHTMLViewer.m
@@ -180,8 +180,7 @@ static NSData* _sanitizeContent(NSData *theData)
 	      // We search until we find a '"' or a space
 	      j = 8;
 
-	      //while (*(bytes+j) != ' ' || *(bytes+j) != '"')
-	      while (*(bytes+j) != '"')
+	      while (*(bytes+j) != ' ' && *(bytes+j) != '"')
 		{
 		  j++;