diff --git a/addons/mass_mailing/static/src/img/theme_basic/s_default_image_block_banner.jpg b/addons/mass_mailing/static/src/img/theme_basic/s_default_image_block_banner.jpg
new file mode 100644
index 00000000000..872366f9985
Binary files /dev/null and b/addons/mass_mailing/static/src/img/theme_basic/s_default_image_block_banner.jpg differ
diff --git a/addons/mass_mailing/static/src/img/theme_basic/s_default_image_block_event.jpg b/addons/mass_mailing/static/src/img/theme_basic/s_default_image_block_event.jpg
new file mode 100644
index 00000000000..50a9d033190
Binary files /dev/null and b/addons/mass_mailing/static/src/img/theme_basic/s_default_image_block_event.jpg differ
diff --git a/addons/mass_mailing/static/src/img/theme_basic/s_default_image_block_image.jpg b/addons/mass_mailing/static/src/img/theme_basic/s_default_image_block_image.jpg
new file mode 100644
index 00000000000..047516fe8d5
Binary files /dev/null and b/addons/mass_mailing/static/src/img/theme_basic/s_default_image_block_image.jpg differ
diff --git a/addons/mass_mailing/static/src/img/theme_basic/s_default_image_block_image_text.jpg b/addons/mass_mailing/static/src/img/theme_basic/s_default_image_block_image_text.jpg
new file mode 100644
index 00000000000..59a1806df7a
Binary files /dev/null and b/addons/mass_mailing/static/src/img/theme_basic/s_default_image_block_image_text.jpg differ
diff --git a/addons/mass_mailing/static/src/img/theme_basic/s_default_image_block_text_image.jpg b/addons/mass_mailing/static/src/img/theme_basic/s_default_image_block_text_image.jpg
new file mode 100644
index 00000000000..0009598d3cb
Binary files /dev/null and b/addons/mass_mailing/static/src/img/theme_basic/s_default_image_block_text_image.jpg differ
diff --git a/addons/mass_mailing/static/src/img/theme_basic/s_default_image_block_three_cols_1.jpg b/addons/mass_mailing/static/src/img/theme_basic/s_default_image_block_three_cols_1.jpg
new file mode 100644
index 00000000000..7a7f2bbd2e4
Binary files /dev/null and b/addons/mass_mailing/static/src/img/theme_basic/s_default_image_block_three_cols_1.jpg differ
diff --git a/addons/mass_mailing/static/src/img/theme_basic/s_default_image_block_three_cols_2.jpg b/addons/mass_mailing/static/src/img/theme_basic/s_default_image_block_three_cols_2.jpg
new file mode 100644
index 00000000000..7a7f2bbd2e4
Binary files /dev/null and b/addons/mass_mailing/static/src/img/theme_basic/s_default_image_block_three_cols_2.jpg differ
diff --git a/addons/mass_mailing/static/src/img/theme_basic/s_default_image_block_three_cols_3.jpg b/addons/mass_mailing/static/src/img/theme_basic/s_default_image_block_three_cols_3.jpg
new file mode 100644
index 00000000000..7a7f2bbd2e4
Binary files /dev/null and b/addons/mass_mailing/static/src/img/theme_basic/s_default_image_block_three_cols_3.jpg differ
diff --git a/addons/mass_mailing/static/src/img/theme_basic/s_default_image_block_two_cols_1.jpg b/addons/mass_mailing/static/src/img/theme_basic/s_default_image_block_two_cols_1.jpg
new file mode 100644
index 00000000000..98ed24c6037
Binary files /dev/null and b/addons/mass_mailing/static/src/img/theme_basic/s_default_image_block_two_cols_1.jpg differ
diff --git a/addons/mass_mailing/static/src/img/theme_basic/s_default_image_block_two_cols_2.jpg b/addons/mass_mailing/static/src/img/theme_basic/s_default_image_block_two_cols_2.jpg
new file mode 100644
index 00000000000..98ed24c6037
Binary files /dev/null and b/addons/mass_mailing/static/src/img/theme_basic/s_default_image_block_two_cols_2.jpg differ
diff --git a/addons/mass_mailing/static/src/img/theme_basic/s_default_image_logo.png b/addons/mass_mailing/static/src/img/theme_basic/s_default_image_logo.png
new file mode 100644
index 00000000000..064f09c1a0a
Binary files /dev/null and b/addons/mass_mailing/static/src/img/theme_basic/s_default_image_logo.png differ
diff --git a/addons/mass_mailing/static/src/img/theme_imgs/basic_thumb_large.png b/addons/mass_mailing/static/src/img/theme_imgs/basic_thumb_large.png
new file mode 100644
index 00000000000..380661de964
Binary files /dev/null and b/addons/mass_mailing/static/src/img/theme_imgs/basic_thumb_large.png differ
diff --git a/addons/mass_mailing/static/src/img/theme_imgs/basic_thumb_logo.png b/addons/mass_mailing/static/src/img/theme_imgs/basic_thumb_logo.png
new file mode 100644
index 00000000000..2a562249545
Binary files /dev/null and b/addons/mass_mailing/static/src/img/theme_imgs/basic_thumb_logo.png differ
diff --git a/addons/mass_mailing/static/src/img/theme_imgs/basic_thumb_small.png b/addons/mass_mailing/static/src/img/theme_imgs/basic_thumb_small.png
new file mode 100644
index 00000000000..32b14ab1976
Binary files /dev/null and b/addons/mass_mailing/static/src/img/theme_imgs/basic_thumb_small.png differ
diff --git a/addons/mass_mailing/static/src/less/themes/theme_basic.less b/addons/mass_mailing/static/src/less/themes/theme_basic.less
new file mode 100644
index 00000000000..088c7cc2e0a
--- /dev/null
+++ b/addons/mass_mailing/static/src/less/themes/theme_basic.less
@@ -0,0 +1,136 @@
+// ============================
+// Mass Mailing "Theme Basic"
+// ============================
+
+// ===== Default Theme palette =====
+@o_mm_basic_color_alpha: #ffffff;
+@o_mm_basic_color_beta: #eeeeee;
+@o_mm_basic_color_gamma: #706482;
+@o_mm_basic_color_delta: #111;
+@o_mm_basic_color_epsilon: darken(@o_mm_basic_color_gamma, 5%);
+@o_mm_basic_color_zeta: #706482;
+@o_mm_basic_color_eta: #87a6b5;
+
+// ===== Default Theme variables =====
+@o_mm_basic_b_radius      : 2px;
+
+@o_mm_basic_font          : -apple-system, "HelveticaNeue", "Helvetica Neue", Helvetica, Arial, "Lucida Grande", sans-serif;
+@o_mm_basic_text_color    : @o_mm_basic_color_delta;
+
+@o_mm_basic_btn_bg        : @o_mm_basic_color_gamma;
+@o_mm_basic_btn_text      : @o_mm_basic_color_beta;
+
+// ===== Editor =====
+#web_editor_inside_iframe {
+    #wrapwrap > main #editable_area {
+        background-color: transparent;
+    }
+}
+
+// ===== Colors =====
+.bg-beta {
+    background-color: @o_mm_basic_color_zeta;
+    color:  @o_mm_basic_color_beta;
+}
+.text-beta {
+    color: @o_mm_basic_color_zeta;
+}
+.bg-delta {
+    background-color: @o_mm_basic_color_eta;
+}
+.bg-gray-lighter {
+    background-color: @o_mm_basic_color_beta;
+}
+
+
+// ===== Layout =====
+.o_layout.o_basic_theme {
+    font-family: @o_mm_basic_font;
+    color: lighten @o_mm_basic_text_color;
+    background-color: @o_mm_basic_color_alpha;
+    padding: 0;
+
+    > .o_mail_wrapper {
+        max-width: none;
+        border: none;
+        background-color: @o_mm_basic_color_alpha;
+    }
+}
+
+// ===== Snippets (general) =====
+.o_mail_snippet_general {
+    max-width: none;
+
+    h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 {
+        color: @o_mm_basic_text_color;
+    }
+
+    .btn.btn-primary {
+        color: @o_mm_basic_btn_text;
+        font-family: @o_mm_basic_font;
+        border-radius: @o_mm_basic_b_radius;
+        background-color: @o_mm_basic_btn_bg;
+    }
+
+    a, .btn.btn-link {
+        color: @o_mm_basic_color_epsilon;
+    }
+
+    .separator {
+        background-color: @o_mm_basic_color_beta;
+    }
+
+    .bg-beta {
+        h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 {
+            color: @o_mm_basic_color_alpha;
+        }
+
+        .btn.btn-primary {
+            background-color: @o_mm_basic_color_eta;
+        }
+
+        a, .btn.btn-link {
+            color: @o_mm_basic_color_eta;
+        }
+    }
+}
+
+// ===== Snippets (specific) =====
+.o_mail_block_steps {
+    margin-left: 20px;
+    margin-right: 20px;
+    background-color: @o_mm_basic_color_beta;
+}
+
+.o_mail_block_event {
+    .o_mail_snippet_general{
+        background: darken(@o_mm_basic_color_beta, 2%);
+    }
+}
+
+.o_mail_block_comparison_table {
+    .separator {
+        background-color: darken(@o_mm_basic_color_beta, 15%);
+    }
+}
+
+.o_mail_block_discount2 {
+    .o_code {
+        background: @o_mm_basic_color_beta;
+    }
+}
+
+.o_mail_block_footer_tag_line {
+    margin-left: 20px;
+    margin-right: 20px;
+}
+
+.o_mail_block_footer_social {
+    .o_mail_table_styles {
+        border-top: 2px solid @o_mm_basic_color_beta;
+    }
+
+    .o_mail_footer_copy {
+        color: lighten(@o_mm_basic_text_color, 30%);
+    }
+}
diff --git a/addons/mass_mailing/views/editor_field_html.xml b/addons/mass_mailing/views/editor_field_html.xml
index fdbb7da5473..611a54e05ea 100644
--- a/addons/mass_mailing/views/editor_field_html.xml
+++ b/addons/mass_mailing/views/editor_field_html.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
 <template id="assets_mail_themes">
+    <link rel="stylesheet" type="text/less" href="/mass_mailing/static/src/less/themes/theme_basic.less"/>
     <link rel="stylesheet" type="text/less" href="/mass_mailing/static/src/less/themes/theme_default.less"/>
 </template>
 
diff --git a/addons/mass_mailing/views/snippets_themes.xml b/addons/mass_mailing/views/snippets_themes.xml
index e92bbdcdd03..a376d023a8a 100644
--- a/addons/mass_mailing/views/snippets_themes.xml
+++ b/addons/mass_mailing/views/snippets_themes.xml
@@ -8,6 +8,11 @@
     <xpath expr="//div[@id='o_scroll']" position="replace">
         <div id="o_scroll">
             <div id="email_designer_themes">
+                <div data-name="basic"
+                     data-img="/mass_mailing/static/src/img/theme_imgs/basic_thumb"
+                     data-images-info='{"logo": {"format": "png"}}'>
+                    <t t-call="mass_mailing.theme_basic_template"/>
+                </div>
                 <div data-name="default"
                      data-img="/mass_mailing/static/src/img/theme_imgs/default_thumb"
                      data-images-info='{"logo": {"format": "png"}}'>
diff --git a/addons/mass_mailing/views/themes_templates.xml b/addons/mass_mailing/views/themes_templates.xml
index 6d938ed4ab1..24e66a77107 100644
--- a/addons/mass_mailing/views/themes_templates.xml
+++ b/addons/mass_mailing/views/themes_templates.xml
@@ -1,5 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
+    <!-- Theme "Basic" template -->
+    <template id="theme_basic_template">
+        <div class="o_mail_block_paragraph">
+            <div class="o_mail_snippet_general">
+                <table align="center" cellspacing="0" cellpadding="0" border="0" class="o_mail_table_styles">
+                    <tbody>
+                        <tr>
+                            <td width="100%" class="o_mail_h_padding o_mail_v_padding">
+                                <p>Dear John,</p>
+                                <p>lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.<br/>
+                                    Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.<br/>
+                                    Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.</p>
+                                <p>Sincerely,<br/></p>
+                                <p>Anna Machiavelli</p>
+                            </td>
+                        </tr>
+                    </tbody>
+                </table>
+            </div>
+        </div>
+    </template>
+
     <!-- Default Theme -->
     <template id="theme_default_template">
         <div class="o_mail_block_header_logo mb16">