diff --git a/UI/MailPartViewers/UIxMailPartHTMLViewer.m b/UI/MailPartViewers/UIxMailPartHTMLViewer.m
index 768629934..68188ea9d 100644
--- a/UI/MailPartViewers/UIxMailPartHTMLViewer.m
+++ b/UI/MailPartViewers/UIxMailPartHTMLViewer.m
@@ -541,6 +541,7 @@ _xmlCharsetForCharset (NSString *charset)
 		       [name isEqualToString: @"onmouseout"] ||
 		       [name isEqualToString: @"onmouseup"] ||
 		       [name isEqualToString: @"onmouseover"] ||
+                       [name isEqualToString: @"onpointerrawupdate"] ||
 
 		       // Keyboard Events
 		       [name isEqualToString: @"onkeydown"] ||
diff --git a/UI/Templates/MailerUI/UIxMailEditor.wox b/UI/Templates/MailerUI/UIxMailEditor.wox
index 2df2ac433..a1eac26e1 100644
--- a/UI/Templates/MailerUI/UIxMailEditor.wox
+++ b/UI/Templates/MailerUI/UIxMailEditor.wox
@@ -274,7 +274,7 @@
                     md-autofocus="::!editor.isNew()"
                     md-no-resize="md-no-resize"
                     md-no-autogrow="md-no-autogrow"
-                    sg-autogrow="!isPopup"
+                    sg-autogrow="true"
                     md-detect-hidden="md-detect-hidden" />
         </md-input-container>
       </md-dialog-content>
diff --git a/UI/WebServerResources/js/Common/sgAutogrow.directive.js b/UI/WebServerResources/js/Common/sgAutogrow.directive.js
index c65aa7777..1daf07f40 100644
--- a/UI/WebServerResources/js/Common/sgAutogrow.directive.js
+++ b/UI/WebServerResources/js/Common/sgAutogrow.directive.js
@@ -58,7 +58,14 @@
         elem.on('keyup', AutoGrowTextArea);
         elem.on('paste', AutoGrowTextArea);
 
-        AutoGrowTextArea();
+        var deregisterWatcher = scope.$watch(function() {
+          return elem[0].value;
+        }, function(content) {
+          if (content) {
+            AutoGrowTextArea();
+            deregisterWatcher(); // watch once
+          }
+        });
       }
     };
   }