[MERGE] forward port branch 11.0 up to f5e7b866860

1 files changed, 5 insertions, 5 deletions

diff --git a/addons/mass_mailing/static/src/js/mass_mailing_editor.js b/addons/mass_mailing/static/src/js/mass_mailing_editor.js
index 7705e62fa9e..c40f31c258f 100644
--- a/addons/mass_mailing/static/src/js/mass_mailing_editor.js
+++ b/addons/mass_mailing/static/src/js/mass_mailing_editor.js
@@ -323,20 +323,20 @@ snippets_editor.Class.include({
             $body.removeClass(all_classes).addClass(theme_params.className);
 
             var $old_layout = $editable_area.find(".o_layout");
-            // This wrapper structure is the only way to have a responsive and
-            // centered fixed-width content column on all mail clients
             var $new_wrapper, $new_wrapper_content;
 
             if (theme_params.nowrap) {
                 $new_wrapper = $new_wrapper_content = $("<div/>", {"class": "oe_structure"});
             }
             else {
+                // This wrapper structure is the only way to have a responsive and
+                // centered fixed-width content column on all mail clients
                 $new_wrapper = $('<table/>', {class: 'o_mail_wrapper'});
-                $new_wrapper_content = $("<td/>", {class: 'o_mail_no_resize o_mail_wrapper_td oe_structure'});
+                $new_wrapper_content = $("<td/>", {class: 'o_mail_no_resize o_mail_no_colorpicker o_mail_wrapper_td oe_structure'});
                 $new_wrapper.append($('<tr/>').append(
-                    $("<td/>", {class: 'o_mail_no_resize'}),
+                    $("<td/>", {class: 'o_mail_no_resize o_not_editable', contenteditable: 'false'}),
                     $new_wrapper_content,
-                    $("<td/>", {class: 'o_mail_no_resize'})
+                    $("<td/>", {class: 'o_mail_no_resize o_not_editable', contenteditable: 'false'})
                 ));
             }
             var $new_layout = $("<div/>", {"class": "o_layout " + theme_params.className}).append($new_wrapper);