diff --git a/UI/MailPartViewers/UIxMailPartHTMLViewer.m b/UI/MailPartViewers/UIxMailPartHTMLViewer.m
index 3d751a1e7..5585743a1 100644
--- a/UI/MailPartViewers/UIxMailPartHTMLViewer.m
+++ b/UI/MailPartViewers/UIxMailPartHTMLViewer.m
@@ -562,6 +562,11 @@ static NSData* _sanitizeContent(NSData *theData)
                                    && ![value hasPrefix: @"mailto:"]
                                    && ![value hasPrefix: @"#"]);
                 }
+	      else if ([name isEqualToString: @"onload"] 
+		       || [name isEqualToString: @"onclick"])
+		{
+		  skipAttribute = YES;
+		}
               else
                 value = [_attributes valueAtIndex: count];
               if (!skipAttribute)