diff --git a/CRM/Admin/Form/MessageTemplates.php b/CRM/Admin/Form/MessageTemplates.php
index 61b1fa258813..6b9ae4fe956e 100644
--- a/CRM/Admin/Form/MessageTemplates.php
+++ b/CRM/Admin/Form/MessageTemplates.php
@@ -171,6 +171,7 @@ public function buildQuickForm() {
           'cols' => '80',
           'rows' => '8',
           'onkeyup' => "return verify(this)",
+          'class' => 'crm-wysiwyg-fullpage',
         )
       );
     }
diff --git a/ang/crmMailing/BodyHtml.html b/ang/crmMailing/BodyHtml.html
index c8400c60bc04..730beecdd866 100644
--- a/ang/crmMailing/BodyHtml.html
+++ b/ang/crmMailing/BodyHtml.html
@@ -14,6 +14,7 @@
         crm-ui-insert-rx="insert:body_html"
         ng-model="mailing.body_html"
         ng-blur="checkTokens(mailing, 'body_html', 'insert:body_html')"
+        class="crm-wysiwyg-fullpage"
         ></textarea>
       <span ng-model="body_html_tokens" crm-ui-validate="hasAllTokens(mailing, 'body_html')"></span>
       <div ng-show="htmlForm.$error.crmUiValidate" class="crmMailing-error-link">
diff --git a/js/wysiwyg/crm.ckeditor.js b/js/wysiwyg/crm.ckeditor.js
index 5130121f8457..c684a5140c4d 100644
--- a/js/wysiwyg/crm.ckeditor.js
+++ b/js/wysiwyg/crm.ckeditor.js
@@ -68,6 +68,8 @@
 
       $(item).addClass('crm-wysiwyg-enabled');
 
+      var isFullPage = $(item).hasClass('crm-wysiwyg-fullpage');
+
       CKEDITOR.replace($(item)[0], {
         filebrowserBrowseUrl: browseUrl + '&type=files',
         filebrowserImageBrowseUrl: browseUrl + '&type=images',
@@ -76,6 +78,7 @@
         filebrowserImageUploadUrl: uploadUrl + '&type=images',
         filebrowserFlashUploadUrl: uploadUrl + '&type=flash',
         allowedContent: true, // For CiviMail!
+        fullPage: isFullPage,
         customConfig: CRM.config.CKEditorCustomConfig,
         on: {
           instanceReady: onReady