diff --git a/UI/MailPartViewers/UIxMailPartHTMLViewer.m b/UI/MailPartViewers/UIxMailPartHTMLViewer.m
index 0b5e6c0b0..4d91a94c4 100644
--- a/UI/MailPartViewers/UIxMailPartHTMLViewer.m
+++ b/UI/MailPartViewers/UIxMailPartHTMLViewer.m
@@ -955,15 +955,18 @@ static NSString *_sanitizeHtmlForDisplay(NSString *content)
   else
     cssContent = @"";
   
-  regex = [NSRegularExpression regularExpressionWithPattern:@"margin-left\\s*:\\s*-[^;]+(\\s*!important)?"
-                                  options: NSRegularExpressionCaseInsensitive error:&error];
-  newResult = [regex stringByReplacingMatchesInString:cssContent options:0 range:NSMakeRange(0, [cssContent length]) withTemplate:@"margin-left: 0 !important"];
-  cssContent = [NSString stringWithString: newResult];
+  if([cssContent length])
+  {
+    regex = [NSRegularExpression regularExpressionWithPattern:@"margin-left\\s*:\\s*-[^;]+(\\s*!important)?"
+                                    options: NSRegularExpressionCaseInsensitive error:&error];
+    newResult = [regex stringByReplacingMatchesInString:cssContent options:0 range:NSMakeRange(0, [cssContent length]) withTemplate:@"margin-left: 0 !important"];
+    cssContent = [NSString stringWithString: newResult];
 
-  regex = [NSRegularExpression regularExpressionWithPattern:@"margin-right\\s*:\\s*-[^;]+(\\s*!important)?"
-                                  options: NSRegularExpressionCaseInsensitive error:&error];
-  newResult = [regex stringByReplacingMatchesInString:cssContent options:0 range:NSMakeRange(0, [cssContent length]) withTemplate:@"margin-right: 0 !important"];
-  cssContent = [NSString stringWithString: newResult];
+    regex = [NSRegularExpression regularExpressionWithPattern:@"margin-right\\s*:\\s*-[^;]+(\\s*!important)?"
+                                    options: NSRegularExpressionCaseInsensitive error:&error];
+    newResult = [regex stringByReplacingMatchesInString:cssContent options:0 range:NSMakeRange(0, [cssContent length]) withTemplate:@"margin-right: 0 !important"];
+    cssContent = [NSString stringWithString: newResult];
+  }
 
   return cssContent;
 }
@@ -1124,15 +1127,18 @@ static NSString *_sanitizeHtmlForDisplay(NSString *content)
   else
     cssContent = @"";
   
-  regex = [NSRegularExpression regularExpressionWithPattern:@"margin-(?:left|right)\\s*:\\s*-[^;]+(\\s*!important)?"
-                                  options: NSRegularExpressionCaseInsensitive error:&error];
-  newResult = [regex stringByReplacingMatchesInString:cssContent options:0 range:NSMakeRange(0, [cssContent length]) withTemplate:@"margin-left: 0 !important"];
-  cssContent = [NSString stringWithString: newResult];
+  if([cssContent length])
+  {
+    regex = [NSRegularExpression regularExpressionWithPattern:@"margin-left\\s*:\\s*-[^;]+(\\s*!important)?"
+                                    options: NSRegularExpressionCaseInsensitive error:&error];
+    newResult = [regex stringByReplacingMatchesInString:cssContent options:0 range:NSMakeRange(0, [cssContent length]) withTemplate:@"margin-left: 0 !important"];
+    cssContent = [NSString stringWithString: newResult];
 
-  regex = [NSRegularExpression regularExpressionWithPattern:@"margin-right\\s*:\\s*-[^;]+(\\s*!important)?"
-                                  options: NSRegularExpressionCaseInsensitive error:&error];
-  newResult = [regex stringByReplacingMatchesInString:cssContent options:0 range:NSMakeRange(0, [cssContent length]) withTemplate:@"margin-right: 0 !important"];
-  cssContent = [NSString stringWithString: newResult];
+    regex = [NSRegularExpression regularExpressionWithPattern:@"margin-right\\s*:\\s*-[^;]+(\\s*!important)?"
+                                    options: NSRegularExpressionCaseInsensitive error:&error];
+    newResult = [regex stringByReplacingMatchesInString:cssContent options:0 range:NSMakeRange(0, [cssContent length]) withTemplate:@"margin-right: 0 !important"];
+    cssContent = [NSString stringWithString: newResult];
+  }
 
   return cssContent;
 }