diff --git a/UI/Templates/MailerUI/UIxMailEditor.wox b/UI/Templates/MailerUI/UIxMailEditor.wox
index 2b2d71f39c..2df2ac4337 100644
--- a/UI/Templates/MailerUI/UIxMailEditor.wox
+++ b/UI/Templates/MailerUI/UIxMailEditor.wox
@@ -274,13 +274,13 @@
                     md-autofocus="::!editor.isNew()"
                     md-no-resize="md-no-resize"
                     md-no-autogrow="md-no-autogrow"
-                    sg-autogrow="sg-autogrow"
+                    sg-autogrow="!isPopup"
                     md-detect-hidden="md-detect-hidden" />
         </md-input-container>
       </md-dialog-content>
 
       <!-- ATTACHMENTS -->
-      <md-dialog-content class="md-actions sg-mail-editor-attachments"
+      <md-dialog-actions class="sg-mail-editor-attachments"
                          layout="row" layout-align="space-between start">
         <!-- Attachments -->
         <md-chips ng-model="editor.uploader.queue"
@@ -311,7 +311,7 @@
           -->
           <!-- multiple="multiple" -->
         </div>
-      </md-dialog-content>
+      </md-dialog-actions>
     </form>
 
     <sg-ripple class="md-default-theme md-accent md-bg"
diff --git a/UI/WebServerResources/js/Common/sgAutogrow.directive.js b/UI/WebServerResources/js/Common/sgAutogrow.directive.js
index 4199eb0113..c65aa7777c 100644
--- a/UI/WebServerResources/js/Common/sgAutogrow.directive.js
+++ b/UI/WebServerResources/js/Common/sgAutogrow.directive.js
@@ -4,26 +4,30 @@
   'use strict';
 
   /**
-   * sgAutogrow - A directive to automatically grow a textarea depending on its content.
+   * sgAutogrow - A directive to conditionally grow a textarea depending on its content.
    *   This directive is an alternative to the autogrow feature of the md-input component.
    *   It fixes the scroll jumping issue described in #3070.
    *
    *    - https://github.com/angular/material/issues/3070
    *    - https://material.angularjs.org/latest/api/directive/mdInput
    *
-   *   The drawback of this simple fix is that it won't shrink the textarea but only
-   *   increase its height. It also requires to set md-no-autogrow.
+   *   The drawback of this directive is that it requires to set md-no-autogrow.
    * @memberof SOGo.Common
    * @ngInject
    * @example:
 
-     <textarea rows="9" md-no-autogrow sg-autogrow />
+     <textarea rows="9" md-no-autogrow sg-autogrow="!isPopup" />
   */
   sgAutogrow.$inject = ['$document', '$timeout'];
   function sgAutogrow($document, $timeout) {
     return {
       restrict: 'A',
+      scope: {
+        autogrow: '=sgAutogrow'
+      },
       link: function(scope, elem, attr) {
+        if (!scope.autogrow) return;
+
         var textarea = elem[0];
         var hiddenDiv = $document[0].createElement('div');
         var content = null;
@@ -46,7 +50,6 @@
             hiddenDiv.style.visibility = 'hidden';
             hiddenDiv.style.display = 'block';
             textarea.style.height = hiddenDiv.offsetHeight + 'px';
-            console.debug('resize to ' + hiddenDiv.offsetHeight + 'px');
             hiddenDiv.style.visibility = 'visible';
             hiddenDiv.style.display = 'none';
           });