diff --git a/addons/mass_mailing/models/mail_mail.py b/addons/mass_mailing/models/mail_mail.py
index 99aca1321a7..679a3d19a88 100644
--- a/addons/mass_mailing/models/mail_mail.py
+++ b/addons/mass_mailing/models/mail_mail.py
@@ -81,8 +81,9 @@ class MailMail(osv.Model):
         body = tools.append_content_to_html(base, body, plaintext=False, container_tag='div')
         # resolve relative image url to absolute for outlook.com
         def _sub_relative2absolute(match):
-            return match.group(1) + urlparse.urljoin(domain, match.group(2)) + '"'
-        body = re.sub('(<img(?=\s)[^>]*\ssrc=")(/[^/][^"]+)"', _sub_relative2absolute, body)
+            return match.group(1) + urlparse.urljoin(domain, match.group(2))
+        body = re.sub('(<img(?=\s)[^>]*\ssrc=")(/[^/][^"]+)', _sub_relative2absolute, body)
+        body = re.sub(r'(<[^>]+\bstyle="[^"]+\burl\(\'?)(/[^/\'][^\'")]+)', _sub_relative2absolute, body)
 
         # generate tracking URL
         if mail.statistics_ids:
diff --git a/addons/website_mail/views/snippets.xml b/addons/website_mail/views/snippets.xml
index 1c75f87243d..00a0806b7e1 100644
--- a/addons/website_mail/views/snippets.xml
+++ b/addons/website_mail/views/snippets.xml
@@ -51,7 +51,7 @@
     <div class="o_panel_body">
         <div name="Center Logo" class="basic_theme o_mail_block_header_center_logo">
             <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #FFFFFF repeat top /100%;color:#777777">
-                <table style="margin: 0 auto;border-collapse:collapse;background:inherit;width:600px;color:inherit" cellpadding="0" cellspacing="0">
+                <table style="margin: 0 auto;border-collapse:collapse;background:inherit;color:inherit" width="600" bgcolor="#FFFFFF" cellpadding="0" cellspacing="0">
                     <tbody>
                         <tr>
                             <td valign="center" style="text-align:center">
@@ -69,7 +69,7 @@
 
         <div name="Center Text" class="basic_theme o_mail_block_header_center_text">
             <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #FFFFFF repeat top /100%;color:#777777">
-                <table style="margin: 0 auto;border-collapse:collapse;background:inherit;color:inherit;width:600px;color:inherit" cellpadding="0" cellspacing="0">
+                <table style="margin: 0 auto;border-collapse:collapse;background:inherit;color:inherit;color:inherit" width="600" bgcolor="#FFFFFF" cellpadding="0" cellspacing="0">
                     <tbody>
                         <tr>
                             <td valign="center" style="text-align:center;font-size: 30px">
@@ -87,7 +87,7 @@
 
         <div name="Logo - Social" class="basic_theme o_mail_block_header_social">
             <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #FFFFFF repeat top /100%;color:#777777">
-                <table cellspacing="0" cellpadding="0" style="width:600px;border-collapse:collapse;background:inherit;color:inherit">
+                <table cellspacing="0" cellpadding="0" style="border-collapse:collapse;background:inherit;color:inherit" width="600" bgcolor="#FFFFFF">
                     <tr>
                         <td valign="center" width="270" style="padding:10px 10px 10px 5px;">
                             &amp;nbsp;
@@ -124,7 +124,7 @@
 
         <div name="Text - Social" class="basic_theme o_mail_block_header_text_social">
             <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #FFFFFF repeat top /100%;color:#777777">
-                <table cellspacing="0" cellpadding="0" style="width:600px;border-collapse:collapse;background:inherit;color:inherit">
+                <table cellspacing="0" cellpadding="0" style="border-collapse:collapse;background:inherit;color:inherit" width="600" bgcolor="#FFFFFF">
                     <tr>
                         <td valign="center" width="270" style="padding:10px 10px 10px 5px;font-size: 30px">
                             &amp;nbsp;
@@ -169,7 +169,7 @@
     <div class="o_panel_body">
         <div name="Title - Subtitle" class="basic_theme o_mail_block_title_sub">
             <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #fff repeat top /100%;color:#777777">
-                <table width="100%" cellspacing="0" cellpadding="0" style="border-collapse:collapse;background:inherit;color:inherit">
+                <table width="600" cellspacing="0" cellpadding="0" style="border-collapse:collapse;background:inherit;color:inherit" bgcolor="#ffffff">
                     <tbody>
                         <tr>
                             <td style="text-align:center;padding-bottom:10px">
@@ -188,7 +188,7 @@
 
         <div name="Text-Image" class="basic_theme o_mail_block_text_image">
             <div style="padding:0px; margin:auto;width:600px;background-color:#fff;color:#777777">
-                <table cellpadding="0" cellspacing="0" width="600" style="margin:auto;border-collapse:collapse;background:inherit;color:inherit">
+                <table cellpadding="0" cellspacing="0" width="600" style="margin:auto;border-collapse:collapse;background:inherit;color:inherit" bgcolor="#ffffff">
                     <tbody>
                         <tr>
                             <td align="left" style="padding:20px;font-size:14px" class="col_mv bg-color">
@@ -221,7 +221,7 @@
 
         <div name="Image Title" class="basic_theme o_mail_block_title_text">
             <div class="snippet_row bg-color" style="padding:0px; margin:auto;width:600px;background: #fff repeat top /100%;color:#777777">
-                <table cellpadding="0" cellspacing="0" style="margin:auto;border-collapse:collapse;background:inherit;color:inherit;width:600px">
+                <table cellpadding="0" cellspacing="0" style="margin:auto;border-collapse:collapse;background:inherit;color:inherit" width="600" bgcolor="#ffffff">
                     <tbody>
                         <tr>
                             <td align="left" style="padding:20px">
@@ -246,7 +246,7 @@
 
         <div name="Content Image" class="basic_theme o_mail_block_text_image">
             <div style="padding:0px; margin:auto;width:600px;background-color:#fff;color:#777777">
-                <table cellpadding="0" cellspacing="0" width="600" style="margin:auto;border-collapse:collapse;background:inherit;color:inherit">
+                <table cellpadding="0" cellspacing="0" width="600" style="margin:auto;border-collapse:collapse;background:inherit;color:inherit" bgcolor="#ffffff">
                     <tbody>
                         <tr>
                             <td align="left" style="padding:20px" class="col_mv bg-color">
@@ -267,7 +267,7 @@
 
         <div name="Image Content" class="basic_theme o_mail_block_image_text">
             <div style="padding:0px; margin:auto;width:600px;background-color:#fff;color:#777777">
-                <table cellpadding="0" cellspacing="0" width="600" style="margin:auto;border-collapse:collapse;background:inherit;color:inherit">
+                <table cellpadding="0" cellspacing="0" width="600" style="margin:auto;border-collapse:collapse;background:inherit;color:inherit" bgcolor="#ffffff">
                     <tbody>
                         <tr>
                             <td style="text-align:center;vertical-align:middle;width:200px;" class="col_mv bg-color">
@@ -288,7 +288,7 @@
 
         <div name="Button" class="basic_theme o_mail_block_button">
             <div class="snippet_row bg-color" style="padding:0;width:600px;max-width:600px;margin:0 auto;background: #fff repeat top /100%;color:#777777">
-                <table style="width:600px;text-align:center;margin:0 auto;border-collapse:collapse;background:inherit;color:inherit">
+                <table style="text-align:center;margin:0 auto;border-collapse:collapse;background:inherit;color:inherit" width="600" bgcolor="#ffffff">
                     <tr>
                         <td class="row" style="padding:10px 0;text-align:center">
                             &amp;nbsp;
@@ -302,7 +302,7 @@
 
         <div name="Three Columns" class="basic_theme o_mail_block_three_cols">
             <div style="padding:0px;width:600px;margin:auto;background-color:#fff;color:#000;color:#777777">
-                <table cellspacing="0" cellpadding="0" style="width:100%;border-collapse:collapse;background:inherit;color:inherit">
+                <table cellspacing="0" cellpadding="0" style="border-collapse:collapse;background:inherit;color:inherit" width="600" bgcolor="#ffffff">
                     <tbody>
                         <tr>
                             <td style="padding:30px 15px;width:33%;text-align:center;background-color:#fff;color:#777777;font-size:14px" class="col_mv bg-color">
@@ -340,7 +340,7 @@
 
         <div name="Text Block" class="basic_theme o_mail_block_simple_text">
             <div class="snippet_row bg-color" style="padding:0;width:600px;max-width:600px;margin:0 auto;background: #fff repeat top /100%;color:#777777">
-                <table style="width:100%;text-align:justify;margin:0 auto;background:inherit;color:inherit;border-collapse:collapse;color:inherit">
+                <table style="text-align:justify;margin:0 auto;background:inherit;color:inherit;border-collapse:collapse;color:inherit" width="600" bgcolor="#ffffff">
                     <tr>
                         <td style="padding:10px 30px;font-size:14px">
                             <p style="margin:0">Dear John</p>
@@ -364,7 +364,7 @@
     <div class="o_panel_body">
         <div name="Separator" class="basic_theme o_mail_block_footer_seprator">
             <div style="padding:0px;width:600px;margin:auto;color:#777777;background-color:#FFFFFF">
-                <table cellspacing="0" cellpadding="0" style="vertical-align:top;padding:0px;font-family:arial;font-size:12px;border-collapse:collapse;background:inherit;color:inherit">
+                <table cellspacing="0" cellpadding="0" style="vertical-align:top;padding:0px;font-family:arial;font-size:12px;border-collapse:collapse;background:inherit;color:inherit" width="600" bgcolor="#FFFFFF">
                     <tbody>
                         <tr>
                             <td valign="top" style="width:600px">
@@ -380,7 +380,7 @@
 
         <div name="Tag Line" class="basic_theme o_mail_block_footer_tag_line">
             <div class="bg-color" style="padding:0px;width:600px;margin:auto;background:#fff;color:#777777">
-                <table style="margin: 0 auto;border-collapse:collapse;background:inherit;color:inherit;width:600px" cellpadding="0" cellspacing="0">
+                <table style="margin: 0 auto;border-collapse:collapse;background:inherit;color:inherit" width="600" bgcolor="#ffffff" cellpadding="0" cellspacing="0">
                     <tbody>
                         <tr>
                             <td valign="center" style="text-align:center;padding:5px">
@@ -403,7 +403,7 @@
     <div class="o_panel_body">
         <div name="Social + Text" class="basic_theme o_mail_block_footer_social">
             <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #FFFFFF repeat top /100%;color:#777777">
-                <table style="margin: 0 auto;border-collapse:collapse;background:inherit;color:inherit;width:600px" cellpadding="0" cellspacing="0">
+                <table style="margin: 0 auto;border-collapse:collapse;background:inherit;color:inherit" width="600" bgcolor="#FFFFFF" cellpadding="0" cellspacing="0">
                     <tbody>
                         <tr>
                             <td valign="center" style="padding:10px 15px 10px 10px">
@@ -454,7 +454,7 @@
 
         <div name="Text + Copyright" class="basic_theme o_mail_block_footer_copyright">
             <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #fff repeat top /100%;color:#777777">
-                <table cellspacing="0" cellpadding="0" style="margin:auto;width:600px;border-collapse:collapse;background:inherit;color:inherit">
+                <table cellspacing="0" cellpadding="0" style="margin:auto;border-collapse:collapse;background:inherit;color:inherit" width="600" bgcolor="#ffffff">
                     <tbody>
                         <tr>
                             <td style="font-size:12px;text-align:center;padding:10px">
@@ -475,19 +475,17 @@
 
         <div name="Text Only" class="basic_theme o_mail_block_footer_text">
             <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #fff repeat top /100%;color:#777777">
-                <center>
-                    <table width="600" cellspacing="0" cellpadding="0" border="0" style="margin: 0 auto; width:600px; border-collapse:collapse;background:inherit;color:inherit">
-                        <tbody>
-                            <tr>
-                                <td valign="middle" align="right" style="font-size:12px;padding:20px;text-align:center">
-                                    &amp;nbsp;
-                                    <a style="color:inherit" href="/page/contactus">Contact Us</a> | <a style="color:inherit" t-att-href="(website.social_facebook) or '#'">Facebook</a> | <a style="color:inherit" t-att-href="(website.social_twitter) or '#'">Twitter</a> | <a style="color:inherit" href="#">Support</a> | <a href="/unsubscribe_from_list" style="color:inherit">Unsubscribe</a>
-                                    &amp;nbsp;
-                                </td>
-                            </tr>
-                        </tbody>
-                    </table>
-                </center>
+                <table width="600" cellspacing="0" cellpadding="0" border="0" style="margin: 0 auto;  border-collapse:collapse;background:inherit;color:inherit" bgcolor="#ffffff">
+                    <tbody>
+                        <tr>
+                            <td valign="middle" align="right" style="font-size:12px;padding:20px;text-align:center">
+                                &amp;nbsp;
+                                <a style="color:inherit" href="/page/contactus">Contact Us</a> | <a style="color:inherit" t-att-href="(website.social_facebook) or '#'">Facebook</a> | <a style="color:inherit" t-att-href="(website.social_twitter) or '#'">Twitter</a> | <a style="color:inherit" href="#">Support</a> | <a href="/unsubscribe_from_list" style="color:inherit">Unsubscribe</a>
+                                &amp;nbsp;
+                            </td>
+                        </tr>
+                    </tbody>
+                </table>
             </div>
         </div>
     </div>
@@ -501,4 +499,4 @@
 </template>
 
 </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/website_mail/views/theme/airmail_snippets.xml b/addons/website_mail/views/theme/airmail_snippets.xml
index eb8da5183f7..ca418273e50 100644
--- a/addons/website_mail/views/theme/airmail_snippets.xml
+++ b/addons/website_mail/views/theme/airmail_snippets.xml
@@ -6,7 +6,7 @@
         <div name="Center Logo" class="airmail o_mail_block_header_center_logo">
             <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #f9f8f8 repeat top /100%">
                 <div style=" width:600px; background-image: url('/website_mail/static/src/img/theme_imgs/airmail.png'); background-repeat: repeat-x; background-size: contain; height: 7px; background-position:-2% 0%; display:block"/>
-                <table width="100%" cellspacing="0" cellpadding="0" border="0" style="border-collapse:collapse;width:600px;">
+                <table cellspacing="0" cellpadding="0" border="0" style="border-collapse:collapse" width="600" bcolor="#f9f8f8">
                     <tbody>
                       <tr>
                           <td width="100%" valign="top" style="text-align:center">
@@ -25,7 +25,7 @@
         <div name="Center Text" class="airmail o_mail_block_header_center_text">
             <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #f9f8f8 repeat top /100%;color: #464646">
                 <div style=" width:600px; background-image: url('/website_mail/static/src/img/theme_imgs/airmail.png'); background-repeat: repeat-x; background-size: contain; height: 7px; background-position:-2% 0%; display:block"/>
-                <table width="100%" cellspacing="0" cellpadding="0" border="0" style="border-collapse:collapse;width:600px">
+                <table cellspacing="0" cellpadding="0" border="0" style="border-collapse:collapse" width="600" bgcolor="#f9f8f8">
                     <tbody>
                         <tr>
                             <td width="100%" valign="top" style="text-align:center;font-size: 30px">
@@ -44,7 +44,7 @@
         <div name="Logo - Social" class="airmail o_mail_block_header_social">
             <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #f9f8f8 repeat top /100%;color: rgb(70,70,70)">
                 <div style=" width:600px; background-image: url('/website_mail/static/src/img/theme_imgs/airmail.png'); background-repeat: repeat-x; background-size: contain; height: 7px; background-position:-2% 0%; display:block"/>
-                <table width="100%" cellspacing="0" cellpadding="0" border="0" style="border-collapse:collapse;width:600px">
+                <table cellspacing="0" cellpadding="0" border="0" style="border-collapse:collapse" width="600" bgcolor="#f9f8f8">
                     <tr>
                         <td width="100%" valign="top" style="font-size: 30px;padding-left:5px">
                             &amp;nbsp;
@@ -95,7 +95,7 @@
         <div name="Text - Social" class="airmail o_mail_block_header_text_social">
             <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #f9f8f8 repeat top /100%;color:#464646">
                 <div style=" width:600px; background-image: url('/website_mail/static/src/img/theme_imgs/airmail.png'); background-repeat: repeat-x; background-size: contain; height: 7px;color: rgb(70,70,70); background-position:-2% 0%; display:block "/>
-                <table width="100%" cellspacing="0" cellpadding="0" border="0" style="border-collapse:collapse">
+                <table width="600" cellspacing="0" cellpadding="0" border="0" style="border-collapse:collapse" bgcolor="#f9f8f8">
                     <tr>
                         <td width="100%" valign="top" style="vertical-align: middle;padding-left:5px;font-size: 30px">
                             &amp;nbsp;
@@ -147,7 +147,7 @@
     <xpath expr="//div[@id='email_designer_default_body']/div[2]" position="inside">
         <div name="Title Content" class="airmail o_mail_block_title_text">
             <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #FFFFFF repeat top /100%">
-                <table style="width:600px">
+                <table width="600" bgcolor="#FFFFFF">
                     <tr>
                         <td style="padding:10px 30px">
                             <p style="font-size:30px;margin:20px 0 10px 0;color:#464646">Your order has been shipped!</p>
@@ -167,7 +167,7 @@
 
         <div name="Title - Subtitle" class="airmail o_mail_block_title_sub">
             <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;color:#464646;background: #FFFFFF repeat top /100%">
-                <table width="100%" cellspacing="0" cellpadding="0" style="border-collapse:collapse;color:inherit">
+                <table width="600" cellspacing="0" cellpadding="0" style="border-collapse:collapse;color:inherit" bgcolor="#FFFFFF">
                     <tbody>
                         <tr>
                             <td style="text-align:center;padding-top:10px">
@@ -186,7 +186,7 @@
 
         <div name="Discount Coupon" class="airmail o_mail_block_discount2">
             <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #FFFFFF repeat top /100%;color:#464646">
-                <table cellspacing="0" cellpadding="0" style="width:100%;border-collapse:collapse">
+                <table cellspacing="0" cellpadding="0" style="border-collapse:collapse" width="600" bgcolor="#FFFFFF">
                     <tbody>
                         <tr>
                             <td style="text-align:center; padding:20px">
@@ -207,7 +207,7 @@
 
         <div name="Discount Offer" class="airmail o_mail_block_discount1">
             <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;color:#464646;background: #FFFFFF repeat top /100%">
-                <table cellpadding="0" cellspacing="0" width="100%" style="border-collapse:collapse">
+                <table cellpadding="0" cellspacing="0" width="600" style="border-collapse:collapse" bgcolor="#FFFFFF">
                     <tbody>
                         <tr>
                             <td style="font-size: 45px; font-weight: 900; text-align:center;padding-top:35px;color:#464646"><p style="margin:0">20% off!</p></td>
@@ -240,8 +240,8 @@
         </div>
 
         <div name="Event" class="airmail o_mail_block_event">
-            <div style="padding:0px;width:600px;margin:auto;text-align:center;color:#fff">
-                <table style="width:100%;border-collapse:collapse;background:inherit">
+            <div style="padding:0px;width:600px;margin:auto;color:#fff">
+                <table style="border-collapse:collapse;background:inherit;text-align:center" width="600">
                     <tr>
                         <td class="col_mv bg-color" style="width: 150px;height: 150px;padding: 0;margin: 0;background-color: rgb(77,107,187);text-align:center;vertical-align:middle;color:#FFFFFF">
                             <time datetime="2014-07-20"> <span style="display: block;font-size: 50px;line-height: 1;padding-top: 10px">21</span> <span style="display: block;font-size: 30px;line-height: 1">Jul</span> <span style="display: block;font-size: 16px;line-height: 1;color: #fff;font-weight: 600">ALL DAY</span> </time>
@@ -301,7 +301,7 @@
 
         <div name="User Profile" class="airmail o_mail_block_profile">
             <div class="snippet_row" style="padding:0px;width:600px;margin:auto;background: #fff repeat top /100%;color:#464646">
-                <table style="padding:30px 15px;border-collapse:collapse;color:inherit width:600px">
+                <table style="padding:30px 15px;border-collapse:collapse;color:inherit" width="600" bgcolor="#ffffff">
                     <tr>
                         <td style="padding: 0 8px 0 20px;text-align: center;font-size:14px;width:30%" class="bg-color col_mv">
                             &amp;nbsp;
@@ -327,7 +327,7 @@
 
         <div name="Content Table" class="airmail o_mail_block_table_content">
             <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #FFFFFF repeat top /100%;color:#464646">
-                <table cellspacing="0" cellpadding="0" style="margin: 0 auto;width:100%;border-collapse:collapse;color:inherit">
+                <table cellspacing="0" cellpadding="0" style="margin: 0 auto;border-collapse:collapse;color:inherit" width="600" bgcolor="#FFFFFF">
                     <tbody>
                         <tr>
                             <td>
@@ -396,7 +396,7 @@
 
         <div name="Two Columns" class="airmail o_mail_block_two_cols">
             <div style="padding:0px;width:600px;margin:auto;background-color:#fff;color:#464646">
-                <table cellspacing="0" cellpadding="0" style="width:100%;border-collapse:collapse;background:inherit;color:inherit">
+                <table cellspacing="0" cellpadding="0" style="border-collapse:collapse;background:inherit;color:inherit" width="600" bgcolor="#ffffff">
                     <tbody>
                         <tr>
                             <td style="padding:30px 10px 30px 30px;width:45%;text-align:center" class="col_mv bg-color">
@@ -425,7 +425,7 @@
 
         <div name="Image - Text" class="airmail o_mail_block_image_text">
             <div class="mv" style="padding:0px;width:600px;margin:auto;background-color:#fff;color:#464646">
-                <table cellspacing="0" cellpadding="0" style="width:100%;border-collapse:collapse;background:inherit">
+                <table cellspacing="0" cellpadding="0" style="border-collapse:collapse;background:inherit" width="600" bgcolor="#ffffff">
                     <tbody>
                         <tr>
                             <td style="width:45%;text-align:center;vertical-align:middle" class="col_mv bg-color">
@@ -444,7 +444,7 @@
 
         <div name="Image" class="airmail o_mail_block_image">
             <div class="snippet_row bg-color" style="width:600px;margin:auto;background: #FFFFFF repeat top /100%">
-                <table cellspacing="0" cellpadding="0" style="width:100%;border-collapse:collapse">
+                <table cellspacing="0" cellpadding="0" style="border-collapse:collapse" width="600" bgcolor="#FFFFFF">
                     <tbody>
                         <tr>
                             <td width="100%" align="center" style="text-align:center">
@@ -465,7 +465,7 @@
 
         <div name="Button" class="airmail o_mail_block_button">
             <div class="snippet_row bg-color" style="padding:0;width:600px;max-width:600px;margin:0 auto;background: #fff repeat top /100%">
-                <table style="width:90%;text-align:center;margin:0 auto;border-collapse:collapse;width:600px">
+                <table style="text-align:center;margin:0 auto;border-collapse:collapse" width="600" bgcolor="#ffffff">
                     <tr>
                         <td class="row" style="padding:10px 0;text-align:center">
                             &amp;nbsp;
@@ -479,7 +479,7 @@
 
         <div name="Text Block" class="airmail o_mail_block_simple_text">
             <div class="snippet_row bg-color" style="padding:0;width:600px;max-width:600px;margin:0 auto;background:#fff repeat top /100%;color:#464646">
-                <table style="width:100%;text-align:justify;margin:0 auto;border-collapse:collapse;color:inherit">
+                <table style="text-align:justify;margin:0 auto;border-collapse:collapse;color:inherit" width="600" bgcolor="#ffffff">
                     <tr>
                         <td style="padding:10px 30px;font-size:14px">
                             <p style="margin:0">Dear John</p>
@@ -494,8 +494,8 @@
         </div>
 
         <div name="Background Image" class="airmail o_mail_block_text_on_img">
-            <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: url('/website_mail/static/src/img/theme_imgs/skyline_bg.gif') top /cover;background-repeat:no-repeat;color:#fff">
-                <table cellspacing="0" cellpadding="0" style="width:100%;border-collapse:collapse;color:inherit">
+            <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;color:#fff">
+                <table cellspacing="0" cellpadding="0" style="border-collapse:collapse;color:inherit;background:#948e94 url('/website_mail/static/src/img/theme_imgs/skyline_bg.gif') top /cover;background-repeat:no-repeat" width="600" bgcolor="#948e94">
                     <tbody>
                         <tr>
                             <td style="padding:30px 30px 0 50px;text-align: left;vertical-align:middle">
@@ -518,7 +518,7 @@
 
         <div name="Steps" class="airmail o_mail_block_steps">
             <div style="padding:0;width:600px;max-width:600px;margin:0 auto">
-                <table style="width:100%;text-align:justify;margin:0 auto;max-width:600px;border-collapse:collapse;background:inherit">
+                <table style="text-align:justify;margin:0 auto;max-width:600px;border-collapse:collapse;background:inherit" width="600">
                     <tr>
                         <td style="padding:10px 0;background-color:#4D6BBB;color:#fff" class="col_mv bg-color">
                             <table style="border-collapse:collapse;background:inherit">
@@ -574,7 +574,7 @@
     <xpath expr="//div[@id='email_designer_default_extra']/div[2]" position="inside">
         <div name="Separator" class="airmail o_mail_block_footer_seprator">
             <div style="padding:0px; margin:auto;max-width:600px;background-color:#FFFFFF">
-                <table cellspacing="0" cellpadding="0" style="vertical-align:top;padding:0px;font-family:arial;font-size:12px;color:rgb(51,51,51);border-collapse:collapse;background:inherit">
+                <table cellspacing="0" cellpadding="0" style="vertical-align:top;padding:0px;font-family:arial;font-size:12px;color:rgb(51,51,51);border-collapse:collapse;background:inherit" width="600" bgcolor="#FFFFFF">
                     <tbody>
                         <tr>
                             <td valign="top" style="width:600px">
@@ -588,7 +588,7 @@
 
         <div name="Tag Line" class="airmail o_mail_block_footer_tag_line">
             <div class="bg-color" style="padding:0px; margin:auto;background:#4D6BBB;color:#FFFFFF;max-width:600px">
-                <table style="margin: 0 auto;border-collapse:collapse;background:inherit;color:inherit;width:600px" cellpadding="0" cellspacing="0">
+                <table style="margin: 0 auto;border-collapse:collapse;background:inherit;color:inherit;" width="600" bgcolor="#FFFFFF" cellpadding="0" cellspacing="0">
                     <tbody>
                         <tr>
                             <td valign="center" style="text-align:center;padding:5px">
@@ -605,7 +605,7 @@
         <div name="Social + Text" class="airmail o_mail_block_footer_social">
             <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #E5E5E5 repeat top /100%;color:#464646">
                 <div style="padding:10px">
-                    <table cellspacing="0" cellpadding="0" style="margin: 0 auto;width:100%;border-collapse:collapse;color:inherit">
+                    <table cellspacing="0" cellpadding="0" style="margin: 0 auto;border-collapse:collapse;color:inherit" width="580" bgcolor="#E5E5E5">
                         <tbody>
                             <tr>
                                 <td style="text-align:center">
@@ -648,7 +648,7 @@
 
         <div name="Text + Copyright" class="airmail o_mail_block_footer_copyright">
             <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #E5E5E5 repeat top /100%">
-                <table cellspacing="0" cellpadding="0" style="margin: 0 auto;width:100%;border-collapse:collapse;color:inherit">
+                <table cellspacing="0" cellpadding="0" style="margin: 0 auto;border-collapse:collapse;color:inherit" width="600" bgcolor="#E5E5E5">
                     <tbody>
                         <tr>
                             <td style="font-size:12px;text-align:center;padding:10px;color:#464646">
@@ -669,26 +669,24 @@
 
         <div name="Text Only" class="airmail o_mail_block_footer_text">
             <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #E5E5E5 repeat top /100%;color:#464646">
-                <center>
-                    <table width="600" cellspacing="0" cellpadding="0" border="0" style="margin: 0 auto;width:100%;border-collapse:collapse;color:inherit">
-                        <tbody>
-                            <tr>
-                                <td valign="middle" align="right" style="font-size:12px;padding:10px;text-align:center">
-                                    &amp;nbsp;
-                                    <a href="/page/contactus" style="padding-right:3px;color:#464646">Contact Us</a> | 
-                                    <t t-if="website.social_facebook">
-                                        <a t-att-href="website.social_facebook" style="padding-right:3px;color:#464646">Facebook</a> | 
-                                    </t>
-                                    <t t-if="website.social_twitter">
-                                        <a t-att-href="website.social_twitter" style="padding-right:3px;color:#464646">Twitter</a> | 
-                                    </t>
-                                    <a href="/unsubscribe_from_list" style="color:#464646">Unsubscribe</a>
-                                    &amp;nbsp;
-                                </td>
-                            </tr>
-                        </tbody>
-                    </table>
-                </center>
+                <table width="600" cellspacing="0" cellpadding="0" border="0" style="margin: 0 auto;border-collapse:collapse;color:inherit;" bgcolor="#E5E5E5">
+                    <tbody>
+                        <tr>
+                            <td valign="middle" align="right" style="font-size:12px;padding:10px;text-align:center">
+                                &amp;nbsp;
+                                <a href="/page/contactus" style="padding-right:3px;color:#464646">Contact Us</a> | 
+                                <t t-if="website.social_facebook">
+                                    <a t-att-href="website.social_facebook" style="padding-right:3px;color:#464646">Facebook</a> | 
+                                </t>
+                                <t t-if="website.social_twitter">
+                                    <a t-att-href="website.social_twitter" style="padding-right:3px;color:#464646">Twitter</a> | 
+                                </t>
+                                <a href="/unsubscribe_from_list" style="color:#464646">Unsubscribe</a>
+                                &amp;nbsp;
+                            </td>
+                        </tr>
+                    </tbody>
+                </table>
             </div>
         </div>
     </xpath>
diff --git a/addons/website_mail/views/theme/cleave_snippets.xml b/addons/website_mail/views/theme/cleave_snippets.xml
index 18e92bbc805..9cb77272a66 100644
--- a/addons/website_mail/views/theme/cleave_snippets.xml
+++ b/addons/website_mail/views/theme/cleave_snippets.xml
@@ -5,7 +5,7 @@
     <xpath expr="//div[@id='email_designer_default_headers']/div[2]" position="inside">
         <div name="Center Logo" class="cleave o_mail_block_header_center_logo">
             <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #fff repeat top /100%">
-                <table style="margin: 0 auto;border-collapse:collapse;width:600px" cellpadding="0" cellspacing="0">
+                <table style="margin: 0 auto;border-collapse:collapse" width="600" bgcolor="#ffffff" cellpadding="0" cellspacing="0">
                     <tbody>
                         <tr>
                             <td valign="center" style="text-align:center">
@@ -23,7 +23,7 @@
 
         <div name="Center Text" class="cleave o_mail_block_header_center_text">
             <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #fff repeat top /100%;color:#414141">
-                <table cellspacing="0" cellpadding="0" style="margin: 0 auto;border-collapse:collapse;width:600px">
+                <table cellspacing="0" cellpadding="0" style="margin: 0 auto;border-collapse:collapse" width="600" bgcolor="#ffffff">
                     <tbody>
                         <tr>
                             <td style="font-size: 30px; text-align:center">
@@ -41,7 +41,7 @@
 
         <div name="Logo - Social" class="cleave o_mail_block_header_social">
             <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #ffffff repeat top /100%">
-                <table width="100%" cellspacing="0" cellpadding="0" border="0" style="border-collapse:collapse;width:600px">
+                <table cellspacing="0" cellpadding="0" border="0" style="border-collapse:collapse" width="600" bgcolor="#ffffff">
                     <tr>
                         <td width="100%" valign="top" style="font-size: 30px;padding-left:5px">
                             &amp;nbsp;
@@ -91,7 +91,7 @@
 
         <div name="Text - Social" class="cleave o_mail_block_header_text_social">
             <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #fff repeat top /100%;color:#414141">
-                <table cellspacing="0" cellpadding="0" width="100%" style="border-collapse:collapse">
+                <table cellspacing="0" cellpadding="0" width="600" style="border-collapse:collapse" bgcolor="#ffffff">
                     <tr>
                         <td valign="center" width="270" style="padding:10px 10px 10px 5px">
                             &amp;nbsp;
@@ -143,7 +143,7 @@
     <xpath expr="//div[@id='email_designer_default_body']/div[2]" position="inside">
         <div name="Title Content" class="cleave o_mail_block_title_text">
             <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #FFFFFF repeat top /100%">
-                <table style="color:#89898d;width:600px">
+                <table style="color:#89898d" width="600" bgcolor="#FFFFFF">
                     <tr>
                         <td style="padding:10px 30px">
                             <p style="font-size:30px;margin:20px 0 10px 0">Your order has been shipped!</p>
@@ -162,7 +162,7 @@
 
         <div name="Title - Subtitle" class="cleave o_mail_block_title_sub">
             <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;color:#89898d;background: #FFFFFF repeat top /100%">
-                <table width="100%" cellspacing="0" cellpadding="0" style="border-collapse:collapse;color:inherit">
+                <table width="600" cellspacing="0" cellpadding="0" style="border-collapse:collapse;color:inherit" bgcolor="#FFFFFF">
                     <tbody>
                         <tr>
                             <td style="text-align:center;padding-top:10px">
@@ -181,7 +181,7 @@
 
         <div name="Content Table" class="cleave o_mail_block_table_content">
             <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #FFFFFF repeat top /100%;color:#F8931E">
-                <table cellspacing="0" cellpadding="0" style="margin: 0 auto;width:100%;border-collapse:collapse;color:inherit">
+                <table cellspacing="0" cellpadding="0" style="margin: 0 auto;border-collapse:collapse;color:inherit" width="600" bgcolor="#FFFFFF">
                     <tbody>
                         <tr>
                             <td>
@@ -209,7 +209,7 @@
                                         <tbody>
                                             <tr>
                                                 <td>
-                                                    <table cellspacing="0" cellpadding="0" style="width:100%;padding-top:30px;text-indent:10px;border-collapse:collapse" data-max-width="500px">
+                                                    <table cellspacing="0" cellpadding="0" style="padding-top:30px;text-indent:10px;border-collapse:collapse" data-max-width="500px">
                                                         <thead>
                                                             <tr style="color: #fff;background: #89898D" class="row col bg-color">
                                                                 <th style="padding: 10px 0px;width:166px;border-left:none;text-align:left;font-size:14px" class="mv">Plan</th>
@@ -249,8 +249,8 @@
         </div>
 
         <div name="Event" class="cleave o_mail_block_event">
-            <div style="padding:0px;width:600px;margin:auto;text-align:center;color:#fff">
-                <table style="width:100%;border-collapse:collapse;border-collapse:collapse;background-color:inherit">
+            <div style="padding:0px;width:600px;margin:auto;color:#fff">
+                <table style="border-collapse:collapse;border-collapse:collapse;background-color:inherit;text-align:center" width="600">
                     <tr>
                         <td class="col_mv bg-color" style="width: 150px;height: 150px;padding: 0;margin: 0;background-color:#1F1F1F;text-align:center;vertical-align:middle;color:#FFFFFF">
                             <time datetime="2014-07-20"> <span style="display: block;font-size: 50px;line-height: 1;padding-top: 10px;color:#fff">21</span> <span style="display: block;font-size: 30px;line-height: 1;color:#fff">Jul</span> <span style="display: block;font-size: 16px;line-height: 1;color: #fff;font-weight: 600">ALL DAY</span> </time>
@@ -310,7 +310,7 @@
 
         <div name="User Profile" class="cleave o_mail_block_profile">
             <div class="snippet_row" style="padding:0px;width:600px;margin:auto;background: #fff repeat top /100%;color:#89898d">
-                <table style="padding:30px 15px;border-collapse:collapse;color:inherit">
+                <table style="padding:30px 15px;border-collapse:collapse;color:inherit" width="600" bgcolor="#ffffff">
                     <tr>
                         <td style="padding: 0 30px 0 20px;text-align: center;font-size:14px" class="bg-color col_mv">
                             &amp;nbsp;
@@ -334,10 +334,10 @@
         </div>
 
         <div name="Discount Coupon" class="cleave o_mail_block_discount2">
-            <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #fff repeat top /100%;color:#89898d;text-align:center">
-                <table style="width:600px">
+            <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #fff repeat top /100%;color:#89898d">
+                <table width="600" bgcolor="#ffffff">
                     <tr>
-                    <td style="padding:10px">
+                    <td style="padding:10px; text-align:center">
                     <p style="margin:0"><strong style="font-size:18px"> Save 20% when you upgrade now!</strong></p>
                     &amp;nbsp;
                     <a href="#" style="-webkit-user-select: none; cursor: pointer; padding: 6px 12px; font-size: 13.63636302948px; line-height: 17.7095623016357px; border-top-left-radius: 4px; border-top-right-radius: 4px; border-bottom-right-radius: 4px; border-bottom-left-radius: 4px; color: rgb(255,255,255); border: 0.909090876579285px solid rgb(76,174,76); text-decoration: none; display: inline-block; margin-bottom: 0px; font-weight: 400; text-align: center; vertical-align: middle; white-space: nowrap; background-image: none; background-color: #48BE19">Upgrade</a>
@@ -354,7 +354,7 @@
 
         <div name="Discount Offer" class="cleave o_mail_block_discount1">
             <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #FFFFFF repeat top /100%">
-                <table cellpadding="0" cellspacing="0" width="100%" style="color:#89898d;border-collapse:collapse">
+                <table cellpadding="0" cellspacing="0" width="600" style="color:#89898d;border-collapse:collapse" bgcolor="#FFFFFF">
                     <tbody>
                         <tr>
                             <td style="font-size: 45px; font-weight: 900; text-align:center;padding-top:35px">
@@ -392,7 +392,7 @@
 
         <div name="Two Columns" class="cleave o_mail_block_two_cols">
             <div style="padding:0px;width:600px;margin:auto;background-color:#fff;color:#89898D">
-                <table cellspacing="0" cellpadding="0" style="width:100%;border-collapse:collapse;background-color:inherit;color:inherit">
+                <table cellspacing="0" cellpadding="0" style="border-collapse:collapse;background-color:inherit;color:inherit" width="600" bgcolor="#ffffff">
                     <tbody>
                         <tr>
                             <td style="padding:30px 10px 30px 30px;width:45%;text-align:center" class="col_mv bg-color">
@@ -421,7 +421,7 @@
 
         <div name="Image Button" class="cleave o_mail_block_image">
             <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #fff repeat top /100%;color:#37302d">
-                <table width="100%" cellspacing="0" cellpadding="0" style="border-collapse:collapse;color:#89898d">
+                <table width="600" cellspacing="0" cellpadding="0" style="border-collapse:collapse;color:#89898d" bgcolor="#ffffff">
                     <tbody>
                         <tr>
                             <td style="text-align:center;padding:20px 0" >
@@ -449,7 +449,7 @@
 
         <div name="Button" class="cleave o_mail_block_button">
             <div class="snippet_row bg-color" style="padding:0;width:600px;max-width:600px;margin:0 auto;background: #fff repeat top /100%">
-                <table style="width:90%;text-align:center;margin:0 auto;border-collapse:collapse;width:600px">
+                <table style="text-align:center;margin:0 auto;border-collapse:collapse" width="600" bgcolor="#ffffff">
                     <tr>
                         <td class="row" style="padding:10px 0;text-align:center">
                             &amp;nbsp;
@@ -463,7 +463,7 @@
 
         <div name="Text Block" class="cleave o_mail_block_simple_text">
             <div class="snippet_row bg-color" style="padding:0;width:600px;max-width:600px;margin:0 auto;background: #fff repeat top /100%;color:#89898d">
-                <table style="width:100%;text-align:justify;margin:0 auto;border-collapse:collapse;color:inherit">
+                <table style="text-align:justify;margin:0 auto;border-collapse:collapse;color:inherit" width="600" bgcolor="#ffffff">
                     <tr>
                         <td style="padding:10px 30px;font-size:14px">
                             <p style="margin:0">Dear John</p>
@@ -478,8 +478,8 @@
         </div>
 
         <div name="Background Image" class="cleave o_mail_block_text_on_img">
-            <div class="snippet_row bg-color" style=" padding:0px;width:600px;margin:auto;background: url('/website_mail/static/src/img/theme_imgs/skyline_bg.gif') top /cover;background-repeat:no-repeat;color:#fff">
-                <table cellspacing="0" cellpadding="0" style="width:100%;border-collapse:collapse;color:inherit">
+            <div class="snippet_row bg-color" style=" padding:0px;width:600px;margin:auto;color:#fff">
+                <table cellspacing="0" cellpadding="0" style="border-collapse:collapse;color:inherit;background:#948e94 url('/website_mail/static/src/img/theme_imgs/skyline_bg.gif') top /cover;background-repeat:no-repeat" width="600" bgcolor="#948e94">
                     <tbody>
                         <tr>
                             <td style="padding:30px 30px 0 50px;text-align: left;vertical-align:middle">
@@ -502,7 +502,7 @@
 
         <div name="Steps" class="cleave o_mail_block_steps">
             <div style="padding:0;width:600px;max-width:600px;margin:0 auto">
-                <table style="width:100%;text-align:justify;margin:0 auto;border-collapse:collapse;background-color:inherit">
+                <table style="text-align:justify;margin:0 auto;border-collapse:collapse;background-color:inherit" width="600">
                     <tr>
                         <td style="padding:10px 0;background-color:#f8931e;color:#fff" class="col_mv bg-color">
                             <table style="border-collapse:collapse;background-color:inherit">
@@ -558,7 +558,7 @@
     <xpath expr="//div[@id='email_designer_default_extra']/div[2]" position="inside">
         <div name="Separator" class="cleave o_mail_block_footer_seprator">
             <div style="padding:0px; margin:auto;max-width:600px;background-color:#fff">
-                <table cellspacing="0" cellpadding="0" style="vertical-align:top;padding:0px;font-family:arial;font-size:12px;color:rgb(51,51,51);border-collapse:collapse;background-color:inherit">
+                <table cellspacing="0" cellpadding="0" style="vertical-align:top;padding:0px;font-family:arial;font-size:12px;color:rgb(51,51,51);border-collapse:collapse;background-color:inherit" width="600" bgcolor="#ffffff">
                     <tbody>
                         <tr>
                             <td valign="top" style="width:600px">
@@ -572,7 +572,7 @@
 
         <div name="Tag Line" class="cleave o_mail_block_footer_tag_line">
             <div class="bg-color" style="padding:0px; margin:auto;background:#F8931E;color:#FFFFFF;max-width:600px">
-                <table style="margin: 0 auto;border-collapse:collapse;background-color:inherit;color:inherit;width:600px" cellpadding="0" cellspacing="0">
+                <table style="margin: 0 auto;border-collapse:collapse;background-color:inherit;color:inherit" width="600" bgcolor="#F8931E" cellpadding="0" cellspacing="0">
                     <tbody>
                         <tr>
                             <td valign="center" style="text-align:center;padding:5px">
@@ -589,7 +589,7 @@
         <div name="Social + Text" class="cleave o_mail_block_footer_social">
             <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #E6E5E5 repeat top /100%;color:#414141">
                 <div style="padding:10px">
-                    <table cellspacing="0" cellpadding="0" style="margin: 0 auto;width:100%;border-collapse:collapse;color:inherit">
+                    <table cellspacing="0" cellpadding="0" style="margin: 0 auto;border-collapse:collapse;color:inherit" width="580" bgcolor="#E6E5E5">
                         <tbody>
                             <tr>
                                 <td style="text-align:center">
@@ -630,7 +630,7 @@
 
         <div name="Text + Copyright" class="cleave o_mail_block_footer_copyright">
             <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #E6E5E5 repeat top /100%">
-                <table cellspacing="0" cellpadding="0" style="margin: 0 auto;width:100%;border-collapse:collapse;color:inherit">
+                <table cellspacing="0" cellpadding="0" style="margin: 0 auto;border-collapse:collapse;color:inherit" width="600" bgcolor="#E6E5E5">
                     <tbody>
                         <tr>
                             <td style="font-size:12px;text-align:center;padding-top:10px;padding-bottom:5px">
@@ -651,26 +651,24 @@
 
         <div name="Text Only" class="cleave o_mail_block_footer_text">
             <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #E6E5E5 repeat top /100%;color:#414141">
-                <center>
-                    <table width="600" cellspacing="0" cellpadding="0" border="0" style="margin: 0 auto;width:100%;border-collapse:collapse;color:inherit">
-                        <tbody>
-                            <tr>
-                                <td valign="middle" align="right" style="font-size:12px;padding:10px;text-align:center">
-                                    &amp;nbsp;
-                                    <a href="/page/contactus" style="color:#414141">Contact Us</a> | 
-                                    <t t-if="website.social_facebook">
-                                        <a t-att-href="website.social_facebook" style="color:#414141">Facebook</a> |
-                                    </t>
-                                    <t t-if="website.social_twitter">
-                                        <a t-att-href="website.social_twitter" style="color:#414141">Twitter</a> | 
-                                    </t>
-                                    <a href="/unsubscribe_from_list" style="color:#414141">Unsubscribe</a>
-                                    &amp;nbsp;
-                                </td>
-                            </tr>
-                        </tbody>
-                    </table>
-                </center>
+                <table width="600" cellspacing="0" cellpadding="0" border="0" style="margin: 0 auto;border-collapse:collapse;color:inherit;" bgcolor="#E6E5E5">
+                    <tbody>
+                        <tr>
+                            <td valign="middle" align="right" style="font-size:12px;padding:10px;text-align:center">
+                                &amp;nbsp;
+                                <a href="/page/contactus" style="color:#414141">Contact Us</a> | 
+                                <t t-if="website.social_facebook">
+                                    <a t-att-href="website.social_facebook" style="color:#414141">Facebook</a> |
+                                </t>
+                                <t t-if="website.social_twitter">
+                                    <a t-att-href="website.social_twitter" style="color:#414141">Twitter</a> | 
+                                </t>
+                                <a href="/unsubscribe_from_list" style="color:#414141">Unsubscribe</a>
+                                &amp;nbsp;
+                            </td>
+                        </tr>
+                    </tbody>
+                </table>
             </div>
         </div>
     </xpath>
diff --git a/addons/website_mail/views/theme/go_snippets.xml b/addons/website_mail/views/theme/go_snippets.xml
index 7ae20bd258e..3515e96356e 100644
--- a/addons/website_mail/views/theme/go_snippets.xml
+++ b/addons/website_mail/views/theme/go_snippets.xml
@@ -5,7 +5,7 @@
     <xpath expr="//div[@id='email_designer_default_headers']/div[2]" position="inside">
         <div name="Center Logo" class="go o_mail_block_header_center_logo">
             <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #282D29 repeat top /100%">
-                <table style="margin: 0 auto;border-collapse:collapse;width:600px" cellpadding="0" cellspacing="0">
+                <table style="margin: 0 auto;border-collapse:collapse" width="600" bgcolor="#282D29" cellpadding="0" cellspacing="0">
                     <tbody>
                         <tr>
                             <td valign="center" style="text-align:center">
@@ -23,7 +23,7 @@
 
         <div name="Center Text" class="go o_mail_block_header_center_text">
             <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #282D29 repeat top /100%;color:#fff">
-                <table cellspacing="0" cellpadding="0" style="margin: 0 auto;border-collapse:collapse;width:600px">
+                <table cellspacing="0" cellpadding="0" style="margin: 0 auto;border-collapse:collapse" width="600" bgcolor="#282D29">
                     <tbody>
                         <tr>
                             <td style="font-size: 30px; text-align:center">
@@ -41,7 +41,7 @@
 
         <div name="Logo - Social" class="go o_mail_block_header_social">
             <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #282D29 repeat top /100%;color:#fff">
-                <table cellspacing="0" cellpadding="0" width="100%" style="border-collapse:collapse">
+                <table cellspacing="0" cellpadding="0" width="600" style="border-collapse:collapse" bgcolor="#282D29">
                     <tr>
                         <td valign="center" width="270" style="padding:10px 10px 10px 5px">
                             &amp;nbsp;
@@ -91,7 +91,7 @@
 
         <div name="Text - Social" class="go o_mail_block_header_text_social">
             <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #282D29 repeat top /100%;color:#fff">
-                <table cellspacing="0" cellpadding="0" width="100%" style="border-collapse:collapse">
+                <table cellspacing="0" cellpadding="0" width="600" style="border-collapse:collapse" bgcolor="#282D29">
                     <tr>
                         <td valign="center" width="270" style="padding:10px 10px 10px 5px;font-size: 30px">
                             &amp;nbsp;
@@ -143,7 +143,7 @@
     <xpath expr="//div[@id='email_designer_default_body']/div[2]" position="inside">
         <div name="Title - Subtitle" class="go o_mail_block_title_sub">
             <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #EFEFEF repeat top /100%;color:#282D29">
-                <table width="100%" cellspacing="0" cellpadding="0" style="border-collapse:collapse;color:inherit">
+                <table width="600" cellspacing="0" cellpadding="0" style="border-collapse:collapse;color:inherit" bgcolor="#EFEFEF">
                     <tbody>
                         <tr>
                             <td style="text-align:center">
@@ -162,7 +162,7 @@
 
         <div name="Discount Coupon" class="go o_mail_block_discount2">
             <div style="padding:0px;width:600px;margin:auto;background-color:#EFEFEF;color:#5e5e5e">
-                <table cellspacing="0" cellpadding="0" style="width:100%;border-collapse:collapse;background-color:inherit">
+                <table cellspacing="0" cellpadding="0" style="border-collapse:collapse;background-color:inherit" width="600" bgcolor="#EFEFEF">
                     <tbody>
                         <tr>
                             <td style="text-align:left; padding-left:30px;vertical-align:middle" class="col_mv bg-color">
@@ -182,7 +182,7 @@
 
         <div name="Discount Offer" class="go o_mail_block_discount1">
             <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #EAEAEA repeat top /100%;color:#282D29">
-                <table width="100%" cellspacing="0" cellpadding="0" style="border-collapse:collapse">
+                <table width="600" cellspacing="0" cellpadding="0" style="border-collapse:collapse" bgcolor="#EAEAEA">
                     <tbody>
                         <tr>
                             <td style="font-size: 45px; font-weight: 900; color: #282D29;text-align:center;padding-top:35px">
@@ -221,8 +221,8 @@
         </div>
 
         <div name="Event" class="go o_mail_block_event">
-            <div style="padding:0px;width:600px;margin:auto;text-align:center;color:#fff">
-                <table style="width:100%;border-collapse:collapse">
+            <div style="padding:0px;width:600px;margin:auto;color:#fff">
+                <table style="border-collapse:collapse;text-align:center" width="600">
                     <tr>
                         <td class="col_mv bg-color" style="width: 150px;height: 150px;padding: 0;margin: 0;background-color: #282D29;text-align:center;vertical-align:middle;color:#FFFFFF">
                             <time datetime="2014-07-20"> <span style="display: block;font-size: 50px;line-height: 1;padding-top: 10px">21</span> <span style="display: block;font-size: 30px;line-height: 1">Jul</span> <span style="display: block;font-size: 16px;line-height: 1;color: #fff;font-weight: 600">ALL DAY</span> </time>
@@ -282,7 +282,7 @@
 
         <div name="User Profile" class="go o_mail_block_profile">
             <div class="snippet_row" style="padding:0px;width:600px;margin:auto;background: #FFFFFF repeat top /100%;color:#282D29">
-                <table style="padding:20px;border-collapse:collapse;color:inherit">
+                <table style="padding:20px;border-collapse:collapse;color:inherit" width="600" bgcolor="#FFFFFF">
                     <tr>
                         <td style="float:left;text-align: center" class="col_mv bg-color">
                             &amp;nbsp;
@@ -302,7 +302,7 @@
 
         <div name="Content Table" class="go o_mail_block_table_content">
             <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #EAEAEA repeat top /100%;color:#282D29">
-                <table cellspacing="0" cellpadding="0" style="margin: 0 auto;width:100%;border-collapse:collapse;color:inherit">
+                <table cellspacing="0" cellpadding="0" style="margin: 0 auto;border-collapse:collapse;color:inherit" width="600" bgcolor="#EAEAEA">
                     <tbody>
                         <tr>
                             <td>
@@ -383,7 +383,7 @@
 
         <div name="Two Columns" class="go o_mail_block_two_cols_content">
             <div style="padding:0px;width:600px;margin:auto;background-color:#EAEAEA;color:#282D29">
-                <table cellspacing="0" cellpadding="0" style="width:100%;border-collapse:collapse;background-color:inherit;color:inherit">
+                <table cellspacing="0" cellpadding="0" style="border-collapse:collapse;background-color:inherit;color:inherit" width="600" bgcolor="#EAEAEA">
                     <tbody>
                         <tr>
                             <td style="padding:30px 10px 30px 30px;width:45%;text-align:justify;font-size:14px" class="col_mv bg-color">
@@ -447,7 +447,7 @@
 
         <div name="Image" class="go o_mail_block_image">
             <div class="snippet_row bg-color" style="width:600px;margin:auto;background: #EAEAEA repeat top /100%">
-                <table cellspacing="0" cellpadding="0" style="width:100%;border-collapse:collapse">
+                <table cellspacing="0" cellpadding="0" style="border-collapse:collapse" width="600" bgcolor="#EAEAEA">
                     <tbody>
                         <tr>
                             <td width="100%" align="center" style="text-align:center">
@@ -470,7 +470,7 @@
 
         <div name="Image Text" class="go o_mail_block_image_text">
             <div style="padding:0px;width:600px;margin:auto;background-color:#282D29;color:#fff">
-                <table cellspacing="0" cellpadding="0" style="width:100%;border-collapse:collapse;background-color:inherit">
+                <table cellspacing="0" cellpadding="0" style="border-collapse:collapse;background-color:inherit" width="600" bgcolor="#282D29">
                     <tbody>
                         <tr>
                             <td style="background-color:#2B934F;padding:25px;text-align:center;vertical-align:middle;width:210px;" class="col_mv bg-color">
@@ -494,7 +494,7 @@
 
         <div name="Button" class="go o_mail_block_button">
             <div class="snippet_row bg-color" style="padding:0;width:600px;max-width:600px;margin:0 auto;background: #EAEAEA repeat top /100%">
-                <table style="width:90%;text-align:center;margin:0 auto;border-collapse:collapse;width:600px">
+                <table style="text-align:center;margin:0 auto;border-collapse:collapse" width="600" bgcolor="#EAEAEA">
                     <tr>
                         <td class="row" style="padding:10px 0;text-align:center">
                             &amp;nbsp;
@@ -508,7 +508,7 @@
 
         <div name="Text Block" class="go o_mail_block_simple_text">
             <div class="snippet_row bg-color" style="padding:0;width:600px;max-width:600px;margin:0 auto;background: #EAEAEA repeat top /100%;color:#282D29">
-                <table style="width:100%;text-align:justify;margin:0 auto;border-collapse:collapse;color:inherit">
+                <table style="text-align:justify;margin:0 auto;border-collapse:collapse;color:inherit" width="600" bgcolor="#EAEAEA">
                     <tr>
                         <td style="padding:10px 30px;font-size:14px">
                             <p style="margin:0">Dear John</p>
@@ -523,8 +523,8 @@
         </div>
 
         <div name="Background Image" class="go o_mail_block_text_on_img">
-            <div class="snippet_row bg-color" style=" padding:0px;width:600px;margin:auto;background: url('/website_mail/static/src/img/theme_imgs/skyline_bg.gif') top /cover;background-repeat:no-repeat;color:#fff">
-                <table cellspacing="0" cellpadding="0" style="width:100%;border-collapse:collapse;color:inherit">
+            <div class="snippet_row bg-color" style=" padding:0px;width:600px;margin:auto;color:#fff">
+                <table cellspacing="0" cellpadding="0" style="border-collapse:collapse;color:inherit;background:#948e94 url('/website_mail/static/src/img/theme_imgs/skyline_bg.gif') top /cover;background-repeat:no-repeat" width="600" bgcolor="#948e94">
                     <tbody>
                         <tr>
                             <td style="padding:30px 30px 0 50px;text-align: left;vertical-align:middle">
@@ -547,7 +547,7 @@
 
         <div name="Steps" class="go o_mail_block_steps">
             <div style="padding:0;width:600px;max-width:600px;margin:0 auto">
-                <table style="width:100%;text-align:justify;margin:0 auto;border-collapse:collapse;background-color:inherit">
+                <table style="text-align:justify;margin:0 auto;border-collapse:collapse;background-color:inherit" width="600">
                     <tr>
                         <td style="padding:10px 0;background-color:#2B934F;color:#fff" class="col_mv bg-color">
                             <table style="border-collapse:collapse;background-color:inherit">
@@ -603,7 +603,7 @@
     <xpath expr="//div[@id='email_designer_default_extra']/div[2]" position="inside">
         <div name="Separator" class="go o_mail_block_footer_seprator">
             <div style="padding:0px;width:600px;margin:auto;background-color:#FFFFFF">
-                <table cellspacing="0" cellpadding="0" style="vertical-align:top;padding:0px;font-family:arial;font-size:12px;color:rgb(51,51,51);border-collapse:collapse;background-color:inherit">
+                <table cellspacing="0" cellpadding="0" style="vertical-align:top;padding:0px;font-family:arial;font-size:12px;color:rgb(51,51,51);border-collapse:collapse;background-color:inherit" width="600" bgcolor="#FFFFFF">
                     <tbody>
                         <tr>
                             <td valign="top" style="width:600px">
@@ -617,7 +617,7 @@
 
         <div name="Tag Line" class="go o_mail_block_footer_tag_line">
             <div class="bg-color" style="padding:0px;width:600px;margin:auto;background:#2B934F">
-                <table style="margin: 0 auto;border-collapse:collapse;background-color:inherit;color:inherit;width:600px" cellpadding="0" cellspacing="0">
+                <table style="margin: 0 auto;border-collapse:collapse;background-color:inherit;color:inherit" width="600" bgcolor="#2B934F" cellpadding="0" cellspacing="0">
                     <tbody>
                         <tr>
                             <td valign="center" style="text-align:center;padding:5px;color:#fff">
@@ -634,7 +634,7 @@
         <div name="Social + Text" class="go o_mail_block_footer_social">
             <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #2B934F repeat top /100%;color:#EEEEEE">
                 <div style="padding:10px">
-                    <table cellspacing="0" cellpadding="0" style="margin: 0 auto;width:100%;border-collapse:collapse;color:inherit">
+                    <table cellspacing="0" cellpadding="0" style="margin: 0 auto;border-collapse:collapse;color:inherit" width="580" bgcolor="#2B934F">
                         <tbody>
                             <tr>
                                 <td style="text-align:center">
@@ -677,7 +677,7 @@
 
         <div name="Text + Copyright" class="go o_mail_block_footer_copyright">
             <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #2B934F repeat top /100%">
-                <table cellspacing="0" cellpadding="0" style="margin: 0 auto;width:100%;border-collapse:collapse">
+                <table cellspacing="0" cellpadding="0" style="margin: 0 auto;border-collapse:collapse" width="600" bgcolor="#2B934F">
                     <tbody>
                         <tr>
                             <td style="font-size:12px;text-align:center;padding:10px;color:#fff">
@@ -698,26 +698,24 @@
 
         <div name="Text Only" class="go o_mail_block_footer_text">
             <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #2B934F repeat top /100%;color:#fff">
-                <center>
-                    <table width="600" cellspacing="0" cellpadding="0" border="0" style="margin: 0 auto;width:100%;border-collapse:collapse;color:inherit">
-                        <tbody>
-                            <tr>
-                                <td valign="middle" align="right" style="font-size:12px;padding:20px;text-align:center">
-                                    &amp;nbsp;
-                                    <a style="color:#fff" href="/page/contactus">Contact Us</a> | 
-                                    <t t-if="website.social_facebook">
-                                        <a style="color:#fff" t-att-href="website.social_facebook">Facebook</a> | 
-                                    </t>
-                                    <t t-if="website.social_twitter">
-                                        <a style="color:#fff" t-att-href="website.social_twitter">Twitter</a> | 
-                                    </t>
-                                    <a href="/unsubscribe_from_list" style="color:#fff">Unsubscribe</a>
-                                    &amp;nbsp;
-                                </td>
-                            </tr>
-                        </tbody>
-                    </table>
-                </center>
+                <table width="600" cellspacing="0" cellpadding="0" border="0" style="margin: 0 auto;border-collapse:collapse;color:inherit;" bgcolor="#2B934F">
+                    <tbody>
+                        <tr>
+                            <td valign="middle" align="right" style="font-size:12px;padding:20px;text-align:center">
+                                &amp;nbsp;
+                                <a style="color:#fff" href="/page/contactus">Contact Us</a> | 
+                                <t t-if="website.social_facebook">
+                                    <a style="color:#fff" t-att-href="website.social_facebook">Facebook</a> | 
+                                </t>
+                                <t t-if="website.social_twitter">
+                                    <a style="color:#fff" t-att-href="website.social_twitter">Twitter</a> | 
+                                </t>
+                                <a href="/unsubscribe_from_list" style="color:#fff">Unsubscribe</a>
+                                &amp;nbsp;
+                            </td>
+                        </tr>
+                    </tbody>
+                </table>
             </div>
         </div>
     </xpath>
diff --git a/addons/website_mail/views/theme/narrative_snippets.xml b/addons/website_mail/views/theme/narrative_snippets.xml
index 987b09c5fb6..41e268e75e8 100644
--- a/addons/website_mail/views/theme/narrative_snippets.xml
+++ b/addons/website_mail/views/theme/narrative_snippets.xml
@@ -5,7 +5,7 @@
     <xpath expr="//div[@id='email_designer_default_headers']/div[2]" position="inside">
         <div name="Center Logo" class="narrative o_mail_block_header_center_logo">
             <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #1F1F1F repeat top /100%">
-                <table style="margin: 0 auto;border-collapse:collapse;width:600px" cellpadding="0" cellspacing="0">
+                <table style="margin: 0 auto;border-collapse:collapse" width="600" bgcolor="#1F1F1F" cellpadding="0" cellspacing="0">
                     <tbody>
                         <tr>
                             <td valign="center" style="text-align:center">
@@ -23,7 +23,7 @@
 
         <div name="Center Text" class="narrative o_mail_block_header_center_text">
             <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #1F1F1F repeat top /100%;color:#fff">
-                <table cellspacing="0" cellpadding="0" style="margin: 0 auto;border-collapse:collapse;width:600px">
+                <table cellspacing="0" cellpadding="0" style="margin: 0 auto;border-collapse:collapse" width="600" bgcolor="#1F1F1F">
                     <tbody>
                         <tr>
                             <td style="font-size: 30px; text-align:center">
@@ -41,7 +41,7 @@
 
         <div name="Logo - Social" class="narrative o_mail_block_header_social">
             <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #1F1F1F repeat top /100%;color:#fff">
-                <table cellspacing="0" cellpadding="0" style="border-collapse:collapse;width:600px">
+                <table cellspacing="0" cellpadding="0" style="border-collapse:collapse" width="600" bgcolor="#1F1F1F">
                     <tr>
                         <td valign="center" width="270" style="padding-left:5px">
                             &amp;nbsp;
@@ -91,7 +91,7 @@
 
         <div name="Text - Social" class="narrative o_mail_block_header_text_social">
             <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #1F1F1F repeat top /100%;color:#fff">
-                <table cellspacing="0" cellpadding="0" style="border-collapse:collapse;width:600px">
+                <table cellspacing="0" cellpadding="0" style="border-collapse:collapse" width="600" bgcolor="#1F1F1F">
                     <tr>
                         <td valign="center" width="270" style="padding-left:5px;font-size:30px">
                             &amp;nbsp;
@@ -143,7 +143,7 @@
     <xpath expr="//div[@id='email_designer_default_body']/div[2]" position="inside">
         <div name="Title - Subtitle" class="narrative o_mail_block_title_sub">
             <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #FFFFFF repeat top /100%;color:#37302d">
-                <table width="100%" cellspacing="0" cellpadding="0" style="border-collapse:collapse;color:inherit">
+                <table width="600" cellspacing="0" cellpadding="0" style="border-collapse:collapse;color:inherit" bgcolor="#FFFFFF">
                     <tbody>
                         <tr>
                             <td style="text-align:center">
@@ -162,7 +162,7 @@
 
         <div name="Image - Content" class="narrative o_mail_block_image_text">
             <div style="padding:0px;width:600px;margin:0 auto;background-color:#fff;color:#37302d">
-                <table cellspacing="0" cellpadding="0" style="width:100%;border-collapse:collapse;background-color:inherit;color:inherit">
+                <table cellspacing="0" cellpadding="0" style="border-collapse:collapse;background-color:inherit;color:inherit" width="600" bgcolor="#ffffff">
                     <tbody>
                         <tr>
                             <td style="padding:20px;vertical-align:middlewidth:210px;" class="col_mv bg-color">
@@ -186,7 +186,7 @@
 
         <div name="Content Table" class="narrative o_mail_block_table_content">
             <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #FFFFFF repeat top /100%;color:#37302d">
-                <table cellspacing="0" cellpadding="0" style="margin: 0 auto;width:100%;border-collapse:collapse">
+                <table cellspacing="0" cellpadding="0" style="margin: 0 auto;border-collapse:collapse" width="600" bgcolor="#FFFFFF">
                     <tbody>
                         <tr>
                             <td>
@@ -255,7 +255,7 @@
 
         <div name="User Profile" class="narrative o_mail_block_profile">
             <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;color:#37302d;background: #FFFFFF repeat top /100%">
-                <table width="100%" style="border-collapse:collapse;color:inherit">
+                <table style="border-collapse:collapse;color:inherit" width="600" bgcolor="#FFFFFF">
                     <thead style="background:inherit">
                         <tr>
                             <th colspan="2" width="70%" style="font-size:32px;padding-left:20px;text-align:left">
@@ -287,8 +287,8 @@
         </div>
 
         <div name="Event" class="narrative o_mail_block_event">
-            <div style="padding:0px;width:600px;margin:auto;text-align:center;color:#fff">
-                <table style="width:100%;border-collapse:collapse;border-collapse:collapse;background-color:inherit">
+            <div style="padding:0px;width:600px;margin:auto;color:#fff">
+                <table style="border-collapse:collapse;border-collapse:collapse;background-color:inherit;text-align:center" width="600">
                     <tr>
                         <td class="col_mv bg-color" style="width: 150px;height: 150px;padding: 0;margin: 0;background-color: rgb(68,68,68);text-align:center;vertical-align:middle;color:#FFFFFF">
                             <time datetime="2014-07-20"> <span style="display: block;font-size: 50px;line-height: 1;padding-top: 10px">21</span> <span style="display: block;font-size: 30px;line-height: 1">Jul</span> <span style="display: block;font-size: 16px;line-height: 1;color: #FFFFFF;font-weight: 600">ALL DAY</span> </time>
@@ -348,7 +348,7 @@
 
         <div name="Discount Offer" class="narrative o_mail_block_discount1">
             <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #808080 repeat top /100%;color:#fff">
-                <table width="100%" cellspacing="0" cellpadding="0" style="border-collapse:collapse">
+                <table width="600" cellspacing="0" cellpadding="0" style="border-collapse:collapse" bgcolor="#808080">
                     <tbody>
                         <tr>
                             <td style="font-size: 45px; font-weight: 900;text-align:center;padding-top:35px;color:#fff">
@@ -383,7 +383,7 @@
 
         <div name="Discount Coupon" class="narrative o_mail_block_discount2">
             <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #F8F8F8 repeat top /100%;color:#37302d">
-                <table cellspacing="0" cellpadding="0" style="width:100%;border-collapse:collapse;color:inherit">
+                <table cellspacing="0" cellpadding="0" style="border-collapse:collapse;color:inherit" width="600" bgcolor="#F8F8F8">
                     <tbody>
                         <tr>
                             <td valign="top" style="padding:20px">
@@ -403,7 +403,7 @@
 
         <div name="Two Columns" class="narrative o_mail_block_two_cols">
             <div style="padding:0px;width:600px;margin:auto;background-color:#fff;color:#37302d">
-                <table cellspacing="0" cellpadding="0" style="width:100%;border-collapse:collapse;background-color:inherit;color:inherit">
+                <table cellspacing="0" cellpadding="0" style="border-collapse:collapse;background-color:inherit;color:inherit" width="600" bgcolor="#FFFFFF">
                     <tbody>
                         <tr>
                             <td style="padding:30px 10px 30px 30px;width:45%;text-align:center" class="col_mv bg-color">
@@ -433,7 +433,7 @@
 
         <div name="Image Content Button" class="narrative o_mail_block_image">
             <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #fff repeat top /100%;color:#37302d">
-                <table width="100%" cellspacing="0" cellpadding="0" style="border-collapse:collapse;color:#37302d">
+                <table width="600" cellspacing="0" cellpadding="0" style="border-collapse:collapse;color:#37302d" bgcolor="#FFFFFF">
                     <tbody>
                         <tr>
                             <td style="text-align:center;padding:20px 0" >
@@ -466,7 +466,7 @@
 
         <div name="Button" class="narrative o_mail_block_button">
             <div class="snippet_row bg-color" style="padding:0;width:600px;max-width:600px;margin:0 auto;background: #FFFFFF repeat top /100%">
-                <table style="width:600px;text-align:center;margin:0 auto;border-collapse:collapse">
+                <table style="text-align:center;margin:0 auto;border-collapse:collapse" width="600" bgcolor="#FFFFFF">
                     <tr>
                         <td class="row bg-color" style="padding:10px 0;text-align:center">
                             &amp;nbsp;
@@ -480,7 +480,7 @@
 
         <div name="Text Block" class="narrative o_mail_block_simple_text">
             <div class="snippet_row bg-color" style="padding:0;width:600px;max-width:600px;margin:0 auto;background: #FFFFFF repeat top /100%;color:#37302d">
-                <table style="width:100%;text-align:justify;margin:0 auto;border-collapse:collapse;color:inherit">
+                <table style="text-align:justify;margin:0 auto;border-collapse:collapse;color:inherit" width="600" bgcolor="#FFFFFF">
                     <tr>
                         <td style="padding:10px 30px;font-size:14px">
                             <p style="margin:0">Dear John</p>
@@ -495,8 +495,8 @@
         </div>
 
         <div name="Background Image" class="narrative o_mail_block_text_on_img">
-            <div class="snippet_row bg-color" style=" padding:0px;width:600px;margin:auto;background: url('/website_mail/static/src/img/theme_imgs/skyline_bg.gif') top /cover;background-repeat:no-repeat;color:#fff">
-                <table cellspacing="0" cellpadding="0" style="width:100%;border-collapse:collapse;color:inherit">
+            <div class="snippet_row bg-color" style=" padding:0px;width:600px;margin:auto;color:#fff">
+                <table cellspacing="0" cellpadding="0" style="border-collapse:collapse;color:inherit;background:#948e94 url('/website_mail/static/src/img/theme_imgs/skyline_bg.gif') top /cover;background-repeat:no-repeat" width="600" bgcolor="#948e94">
                     <tbody>
                         <tr>
                             <td style="padding:30px 30px 0 50px;text-align: left;vertical-align:middle">
@@ -519,7 +519,7 @@
 
         <div name="Steps" class="narrative o_mail_block_steps">
             <div style="padding:0;width:600px;max-width:600px;margin:0 auto">
-                <table style="width:100%;text-align:justify;margin:0 auto;border-collapse:collapse;background-color:inherit">
+                <table style="text-align:justify;margin:0 auto;border-collapse:collapse;background-color:inherit" width="600">
                     <tr>
                         <td style="padding:10px 0;background-color:#D74A38;color:#fff" class="col_mv bg-color">
                             <table style="border-collapse:collapse;background-color:inherit">
@@ -575,7 +575,7 @@
     <xpath expr="//div[@id='email_designer_default_extra']/div[2]" position="inside">
         <div name="Separator" class="narrative o_mail_block_footer_seprator">
             <div style="padding:0px; margin:auto;max-width:600px;background-color:#FFFFFF">
-                <table cellspacing="0" cellpadding="0" style="vertical-align:top;padding:0px;font-family:arial;font-size:12px;color:rgb(51,51,51);border-collapse:collapse;background-color:inherit">
+                <table cellspacing="0" cellpadding="0" style="vertical-align:top;padding:0px;font-family:arial;font-size:12px;color:rgb(51,51,51);border-collapse:collapse;background-color:inherit" width="600" bgcolor="#FFFFFF">
                     <tbody>
                         <tr>
                             <td valign="top" style="width:600px">
@@ -589,7 +589,7 @@
 
         <div name="Tag Line" class="narrative o_mail_block_footer_tag_line">
             <div class="bg-color" style="padding:0px; margin:auto;background:rgb(215,74,56);color:#FFFFFF;max-width:600px">
-                <table style="margin: 0 auto;border-collapse:collapse;background-color:inherit;color:inherit;width:600px" cellpadding="0" cellspacing="0">
+                <table style="margin: 0 auto;border-collapse:collapse;background-color:inherit;color:inherit" width="600" bgcolor="rgb(215,74,56)" cellpadding="0" cellspacing="0">
                     <tbody>
                         <tr>
                             <td valign="center" style="text-align:center;padding:5px">
@@ -606,7 +606,7 @@
         <div name="Social + Text" class="narrative o_mail_block_footer_social">
             <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #1F1F1F repeat top /100%;color:#fff">
                 <div style="padding:10px">
-                    <table cellspacing="0" cellpadding="0" style="margin: 0 auto;width:600px;border-collapse:collapse;color:inherit">
+                    <table cellspacing="0" cellpadding="0" style="margin: 0 auto;border-collapse:collapse;color:inherit" width="580" bgcolor="#1F1F1F">
                         <tbody>
                             <tr>
                                 <td style="text-align:center ">
@@ -649,7 +649,7 @@
 
         <div name="Text + Copyright" class="narrative o_mail_block_footer_copyright">
             <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #1F1F1F repeat top /100%">
-                <table cellspacing="0" cellpadding="0" style="margin: 0 auto;width:600px;border-collapse:collapse">
+                <table cellspacing="0" cellpadding="0" style="margin: 0 auto;border-collapse:collapse" width="600" bgcolor="#1F1F1F">
                     <tbody>
                         <tr>
                             <td style="font-size:12px;text-align:center;padding-top:10px;padding-bottom:5px;color:#fff">
@@ -670,26 +670,24 @@
 
         <div name="Text Only" class="narrative o_mail_block_footer_text">
             <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #1F1F1F repeat top /100%;color:#fff">
-                <center>
-                    <table width="600" cellspacing="0" cellpadding="0" border="0" style="margin: 0 auto;width:600px;border-collapse:collapse;color:inherit">
-                        <tbody>
-                            <tr>
-                                <td valign="middle" align="right" style="font-size:12px;padding:20px;text-align:center">
-                                    &amp;nbsp;
-                                    <a href="/page/contactus" style="color:#fff">Contact Us</a> | 
-                                    <t t-if="website.social_facebook">
-                                        <a t-att-href="website.social_facebook" style="color:#fff">Facebook</a> | 
-                                    </t>
-                                    <t t-if="website.social_twitter">
-                                        <a t-att-href="website.social_twitter" style="color:#fff">Twitter</a> | 
-                                    </t>
-                                    <a href="/unsubscribe_from_list" style="color:#fff">Unsubscribe</a>
-                                    &amp;nbsp;
-                                </td>
-                            </tr>
-                        </tbody>
-                    </table>
-                </center>
+                <table cellspacing="0" cellpadding="0" border="0" style="margin: 0 auto;border-collapse:collapse;color:inherit;" width="600" bgcolor="#1F1F1F">
+                    <tbody>
+                        <tr>
+                            <td valign="middle" align="right" style="font-size:12px;padding:20px;text-align:center">
+                                &amp;nbsp;
+                                <a href="/page/contactus" style="color:#fff">Contact Us</a> | 
+                                <t t-if="website.social_facebook">
+                                    <a t-att-href="website.social_facebook" style="color:#fff">Facebook</a> | 
+                                </t>
+                                <t t-if="website.social_twitter">
+                                    <a t-att-href="website.social_twitter" style="color:#fff">Twitter</a> | 
+                                </t>
+                                <a href="/unsubscribe_from_list" style="color:#fff">Unsubscribe</a>
+                                &amp;nbsp;
+                            </td>
+                        </tr>
+                    </tbody>
+                </table>
             </div>
         </div>
     </xpath>
diff --git a/addons/website_mail/views/theme/neopolitan_snippets.xml b/addons/website_mail/views/theme/neopolitan_snippets.xml
index 98c4c557851..b699a8f13e6 100644
--- a/addons/website_mail/views/theme/neopolitan_snippets.xml
+++ b/addons/website_mail/views/theme/neopolitan_snippets.xml
@@ -5,7 +5,7 @@
     <xpath expr="//div[@id='email_designer_default_headers']/div[2]" position="inside">
         <div name="Center Logo" class="neopolitan o_mail_block_header_center_logo">
             <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #fff repeat top /100%">
-                <table style="margin: 0 auto;width:600px;" cellpadding="0" cellspacing="0">
+                <table style="margin: 0 auto" width="600" bgcolor="#ffffff" cellpadding="0" cellspacing="0">
                     <tbody>
                         <tr>
                             <td valign="center" style="text-align:center">
@@ -23,7 +23,7 @@
 
         <div name="Center Text" class="neopolitan o_mail_block_header_center_text">
             <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #fff repeat top /100%;color:#414141">
-                <table cellspacing="0" cellpadding="0" style="margin: 0 auto;border-collapse:collapse;width:600px">
+                <table cellspacing="0" cellpadding="0" style="margin: 0 auto;border-collapse:collapse" width="600" bgcolor="#ffffff">
                     <tbody>
                         <tr>
                             <td style="font-size: 30px; text-align:center">
@@ -41,7 +41,7 @@
 
         <div name="Logo - Social" class="neopolitan o_mail_block_header_social">
             <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #ffffff repeat top /100%">
-                <table cellspacing="0" cellpadding="0" width="100%" style="border-collapse:collapse">
+                <table cellspacing="0" cellpadding="0" width="600" style="border-collapse:collapse" bgcolor="#ffffff">
                     <tr>
                         <td valign="center" width="270" style="padding:10px 10px 10px 5px">
                             &amp;nbsp;
@@ -91,7 +91,7 @@
 
         <div name="Text - Social" class="neopolitan o_mail_block_header_text_social">
             <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #fff repeat top /100%;color:#414141">
-                <table cellspacing="0" cellpadding="0" width="100%" style="border-collapse:collapse">
+                <table cellspacing="0" cellpadding="0" width="600" style="border-collapse:collapse" bgcolor="#ffffff">
                     <tr>
                         <td valign="center" width="270" style="padding:10px 10px 10px 5px">
                             &amp;nbsp;
@@ -143,7 +143,7 @@
     <xpath expr="//div[@id='email_designer_default_body']/div[2]" position="inside">
         <div name="Title - Subtitle" class="neopolitan o_mail_block_title_sub">
             <div class="bg-color" style="padding:0px;width:600px;margin:auto;color:#414141;background-color:#FFFFFF">
-                <table width="100%" cellspacing="0" cellpadding="0" style="background-color:inherit;border-collapse:collapse;color:inherit">
+                <table width="600" cellspacing="0" cellpadding="0" style="background-color:inherit;border-collapse:collapse;color:inherit" bgcolor="#FFFFFF">
                       <tbody>
                           <tr>
                               <td style="text-align:center">
@@ -162,7 +162,7 @@
 
         <div name="Discount Coupon" class="neopolitan o_mail_block_discount2">
             <div style="padding:0px;width:600px;margin:auto;background-color:#44B7B7;color:#168484">
-                <table cellspacing="0" cellpadding="0" style="width:100%;background-color:inherit;border-collapse:collapse;color:inherit">
+                <table cellspacing="0" cellpadding="0" style="background-color:inherit;border-collapse:collapse;color:inherit" width="600" bgcolor="#44B7B7">
                     <tbody>
                         <tr>
                             <td style="text-align:left; padding-left:20px;vertical-align:middle;font-size:14px" class="col_mv bg-color">
@@ -182,7 +182,7 @@
 
         <div name="Discount Offer" class="neopolitan o_mail_block_discount1">
             <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #F46B45 repeat top /100%;color:#933F24">
-                <table width="100%" cellspacing="0" cellpadding="0" style="border-collapse:collapse;color:inherit">
+                <table width="600" cellspacing="0" cellpadding="0" style="border-collapse:collapse;color:inherit" bgcolor="#F46B45">
                     <tbody>
                         <tr>
                             <td style="font-size: 45px; font-weight: 900; color: #fff;text-align:center;padding-top:35px">
@@ -219,8 +219,8 @@
         </div>
 
         <div name="Event" class="neopolitan o_mail_block_event">
-            <div style="padding:0px;width:600px;margin:auto;text-align:center;color:#fff;max-width:600px">
-                <table style="width:100%;border-collapse:collapse;background-color:inherit;border-collapse:collapse">
+            <div style="padding:0px;width:600px;margin:auto;color:#fff;max-width:600px">
+                <table style="border-collapse:collapse;background-color:inherit;border-collapse:collapse;text-align:center" width="600">
                     <tr>
                         <td class="col_mv" style="width: 150px;height: 150px;padding: 0;margin: 0;background-color: rgb(72,72,72);text-align:center;vertical-align:middle;color:#fff">
                             <time datetime="2014-07-20"> <span style="display: block;font-size: 50px;line-height: 1;padding-top: 10px">21</span> <span style="display: block;font-size: 30px;line-height: 1">Jul</span> <span style="display: block;font-size: 16px;line-height: 1;color: #fff;font-weight: 600">ALL DAY</span> </time>
@@ -280,7 +280,7 @@
 
         <div name="Content Table" class="neopolitan o_mail_block_table_content">
             <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #F46B45 repeat top /100%;color:#933F24">
-                <table cellspacing="0" cellpadding="0" style="margin: 0 auto;width:100%;border-collapse:collapse;color:inherit">
+                <table cellspacing="0" cellpadding="0" style="margin: 0 auto;border-collapse:collapse;color:inherit" width="600" bgcolor="#F46B45">
                     <tbody>
                         <tr>
                             <td>
@@ -306,7 +306,7 @@
                                         <tbody>
                                             <tr>
                                                 <td>
-                                                    <table cellspacing="0" cellpadding="0" style="width:500px;padding-top:30px;border-collapse:collapse" data-max-width="500px">
+                                                    <table cellspacing="0" cellpadding="0" style="padding-top:30px;border-collapse:collapse" width="500" data-max-width="500px">
                                                         <thead style="color:#fff;background-color:#933F24">
                                                             <tr class="row col bg-color">
                                                                 <th style="padding: 10px 0px;text-align:center;border-left:none" class="mv">
@@ -359,7 +359,7 @@
 
         <div name="Two Columns" class="neopolitan o_mail_block_two_cols">
             <div style="padding:0px;width:600px;margin:auto;background-color:#F46B45;color:#A2432A">
-                <table cellspacing="0" cellpadding="0" style="width:100%;background-color:inherit;border-collapse:collapse">
+                <table cellspacing="0" cellpadding="0" style="background-color:inherit;border-collapse:collapse" width="600" bgcolor="#F46B45">
                     <tbody>
                         <tr>
                             <td style="padding:30px 15px;width:45%;text-align:center;background-color:#fff;color:#44B7B7;font-size:14px;line-height:1.4" class="col_mv bg-color">
@@ -382,7 +382,7 @@
 
         <div name="Image" class="neopolitan o_mail_block_image">
             <div class="snippet_row bg-color" style="width:600px;margin:auto;background: #44B7B7 repeat top /100%">
-                <table cellspacing="0" cellpadding="0" style="width:100%;border-collapse:collapse">
+                <table cellspacing="0" cellpadding="0" style="border-collapse:collapse" width="600" bgcolor="#44B7B7">
                     <tbody>
                         <tr>
                             <td width="100%" align="center" style="text-align:center; color: #fff;">
@@ -410,7 +410,7 @@
 
         <div name="Image - Text" class="neopolitan o_mail_block_image_text">
             <div class="mv" style="padding:0px;width:600px;max-width:600px;margin:auto;background-color:#44B7B7;color:#168484">
-                <table cellspacing="0" cellpadding="0" style="width:100%;background-color:inherit;border-collapse:collapse;color:inherit">
+                <table cellspacing="0" cellpadding="0" style="background-color:inherit;border-collapse:collapse;color:inherit" width="600" bgcolor="#44B7B7">
                     <tbody>
                         <tr>
                             <td style="width:35%;padding-bottom:25px;padding-top:30px;background-color:rgb(72,72,72);rgb(68,183,183);text-align:center;vertical-align:middle" class="col_mv bg-color">
@@ -433,7 +433,7 @@
 
         <div name="Button" class="neopolitan o_mail_block_button">
             <div class="snippet_row bg-color" style="padding:0;width:600px;max-width:600px;margin:0 auto;background: #fff repeat top /100%;color:#168484">
-                <table style="width:600px;text-align:center;margin:0 auto;border-collapse:collapse">
+                <table style="text-align:center;margin:0 auto;border-collapse:collapse" width="600" bgcolor="#ffffff">
                     <tr>
                         <td class="row" style="padding:10px 0;text-align:center">
                             &amp;nbsp;
@@ -447,7 +447,7 @@
 
         <div name="Text Block" class="neopolitan o_mail_block_simple_text">
             <div class="snippet_row bg-color" style="padding:0;width:600px;max-width:600px;margin:0 auto;background: #fff repeat top /100%;color:#168484">
-                <table style="width:100%;text-align:justify;margin:0 auto;inherit;border-collapse:collapse;color:inherit">
+                <table style="text-align:justify;margin:0 auto;inherit;border-collapse:collapse;color:inherit" width="600" bgcolor="#ffffff">
                     <tr>
                         <td style="padding:10px 30px;font-size:14px;line-height:20px">
                             <p style="margin:0">Dear John</p>
@@ -462,8 +462,8 @@
         </div>
 
         <div name="Background Image" class="neopolitan o_mail_block_text_on_img">
-            <div class="snippet_row" style="padding:0px;width:600px;margin:auto;background:url('/website_mail/static/src/img/theme_imgs/skyline_bg.gif') top /cover;background-repeat:no-repeat;color:#fff">
-                <table cellspacing="0" cellpadding="0" style="width:100%;border-collapse:collapse;color:inherit">
+            <div class="snippet_row" style="padding:0px;width:600px;margin:auto;color:#fff">
+                <table cellspacing="0" cellpadding="0" style="border-collapse:collapse;color:inherit;background:#948e94 url('/website_mail/static/src/img/theme_imgs/skyline_bg.gif') top /cover;background-repeat:no-repeat" width="600" bgcolor="#948e94">
                     <tbody>
                         <tr>
                             <td style="padding:30px 30px 0 50px;text-align: left;vertical-align:middle">
@@ -486,7 +486,7 @@
 
         <div name="Steps" class="neopolitan o_mail_block_steps">
             <div style="padding:0;width:600px;max-width:600px;margin:0 auto">
-                <table style="width:100%;text-align:justify;margin:0 auto;background-color:inherit;border-collapse:collapse">
+                <table style="text-align:justify;margin:0 auto;background-color:inherit;border-collapse:collapse" width="600">
                     <tr>
                         <td style="padding:10px 0;background-color:#168484;color:#fff" class="col_mv bg-color">
                             <table style="border-collapse:collapse;background-color:inherit">
@@ -542,7 +542,7 @@
     <xpath expr="//div[@id='email_designer_default_extra']/div[2]" position="inside">
         <div name="Separator" class="neopolitan o_mail_block_footer_seprator">
             <div style="padding:0px;width:600px;margin:auto;background-color:#FFFFFF">
-                <table cellspacing="0" cellpadding="0" style="vertical-align:top;padding:0px;font-family:arial;font-size:12px;color:rgb(51,51,51);background-color:inherit;border-collapse:collapse">
+                <table cellspacing="0" cellpadding="0" style="vertical-align:top;padding:0px;font-family:arial;font-size:12px;color:rgb(51,51,51);background-color:inherit;border-collapse:collapse" width="600" bgcolor="#FFFFFF">
                     <tbody>
                         <tr>
                             <td valign="top" style="width:600px">
@@ -556,7 +556,7 @@
 
         <div name="Tag Line" class="neopolitan o_mail_block_footer_tag_line">
             <div class="bg-color" style="padding:0px;width:600px;margin:auto;background:#44B7B7;color:#fff">
-                <table style="margin: 0 auto;background-color:inherit;width:600px;border-collapse:collapse;color:inherit" cellpadding="0" cellspacing="0">
+                <table style="margin: 0 auto;background-color:inherit;border-collapse:collapse;color:inherit" width="600" bgcolor="#44B7B7" cellpadding="0" cellspacing="0">
                     <tbody>
                         <tr>
                             <td valign="center" style="text-align:center;padding:5px">
@@ -573,7 +573,7 @@
         <div name="Social + Text" class="neopolitan o_mail_block_footer_social">
             <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #414141 repeat top /100%;color:#44B7B7">
                 <div style="padding:10px">
-                    <table cellspacing="0" cellpadding="0" style="margin: 0 auto;width:100%;border-collapse:collapse;color:inherit;color:inherit">
+                    <table cellspacing="0" cellpadding="0" style="margin: 0 auto;border-collapse:collapse;color:inherit;color:inherit" width="580" bgcolor="#414141">
                         <tbody>
                             <tr>
                                 <td style="text-align:center">
@@ -616,7 +616,7 @@
 
         <div name="Text + Copyright" class="neopolitan o_mail_block_footer_copyright">
             <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #414141 repeat top /100%;color:#fff">
-                <table cellspacing="0" cellpadding="0" style="margin: 0 auto;width:100%;border-collapse:collapse">
+                <table cellspacing="0" cellpadding="0" style="margin: 0 auto;border-collapse:collapse" width="600" bgcolor="#414141">
                     <tbody>
                         <tr>
                             <td style="font-size:12px;text-align:center;padding-top:10px;color:#44B7B7;padding-bottom:5px">
@@ -636,26 +636,24 @@
 
         <div name="Text Only" class="neopolitan o_mail_block_footer_text">
             <div class="snippet_row" style="padding:0px;width:600px;margin:auto;background: #414141 repeat top /100%;color:#44B7B7">
-                <center>
-                    <table width="600" cellspacing="0" cellpadding="0" border="0" style="margin: 0 auto;width:100%;border-collapse:collapse;color:inherit">
-                        <tbody>
-                            <tr>
-                                <td valign="middle" align="right" style="font-size:12px;padding:10px;text-align:center">
-                                    &amp;nbsp;
-                                    <a href="/page/contactus" style="color:#44B7B7">Contact Us</a> | 
-                                    <t t-if="website.social_facebook">
-                                        <a t-att-href="website.social_facebook" style="color:#44B7B7">Facebook</a> | 
-                                    </t>
-                                    <t t-if="website.social_twitter">
-                                        <a t-att-href="website.social_twitter" style="color:#44B7B7">Twitter</a> | 
-                                    </t>
-                                    <a href="/unsubscribe_from_list" style="color:#44B7B7">Unsubscribe</a>
-                                    &amp;nbsp;
-                                </td>
-                            </tr>
-                        </tbody>
-                    </table>
-                </center>
+                <table width="600" cellspacing="0" cellpadding="0" border="0" style="margin: 0 auto;border-collapse:collapse;color:inherit;" bgcolor="#414141">
+                    <tbody>
+                        <tr>
+                            <td valign="middle" align="right" style="font-size:12px;padding:10px;text-align:center">
+                                &amp;nbsp;
+                                <a href="/page/contactus" style="color:#44B7B7">Contact Us</a> | 
+                                <t t-if="website.social_facebook">
+                                    <a t-att-href="website.social_facebook" style="color:#44B7B7">Facebook</a> | 
+                                </t>
+                                <t t-if="website.social_twitter">
+                                    <a t-att-href="website.social_twitter" style="color:#44B7B7">Twitter</a> | 
+                                </t>
+                                <a href="/unsubscribe_from_list" style="color:#44B7B7">Unsubscribe</a>
+                                &amp;nbsp;
+                            </td>
+                        </tr>
+                    </tbody>
+                </table>
             </div>
         </div>
     </xpath>
diff --git a/addons/website_mail/views/theme/skyline_snippets.xml b/addons/website_mail/views/theme/skyline_snippets.xml
index 126b57e18dd..ee5dc4b3b0d 100644
--- a/addons/website_mail/views/theme/skyline_snippets.xml
+++ b/addons/website_mail/views/theme/skyline_snippets.xml
@@ -5,13 +5,13 @@
     <xpath expr="//div[@id='email_designer_default_headers']/div[2]" position="inside">
         <div name="Center Logo" class="skyline o_mail_block_header_center_logo">
             <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #FFFFFF repeat top /100%;border-bottom:3px solid #3bcdc3">
-                <table style="margin: 0 auto;width:600px;" cellpadding="0" cellspacing="0">
+                <table style="margin: 0 auto" width="600" cellpadding="0" cellspacing="0" bgcolor="#FFFFFF">
                     <tbody>
                         <tr>
                             <td valign="center" style="text-align:center">
                                 &amp;nbsp;
                                 <a t-att-href="(website.company_id.website) or '#'" style="text-decoration:none">
-                                    <img src="/logo.png" style="padding:10px;height:auto;max-width:600px;width:200px" alt="Your Logo" />
+                                    <img src="/logo.png" style="padding:10px;height:auto;max-width:600px;width:200px" alt="your logo" />
                                 </a>
                                 &amp;nbsp;
                             </td>
@@ -22,8 +22,8 @@
         </div>
 
         <div name="Center Text" class="skyline o_mail_block_header_center_text">
-            <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #FFFFFF repeat top /100%;border-bottom:3px solid #3bcdc3;color:#37302d;width:600px">
-                <table cellspacing="0" cellpadding="0" style="margin: 0 auto;border-collapse:collapse;width:600px">
+            <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #FFFFFF repeat top /100%;color:#37302d">
+                <table cellspacing="0" cellpadding="0" style="margin: 0 auto;border-collapse:collapse;border-bottom:3px solid #3bcdc3" width="600" bgcolor="#FFFFFF">
                     <tbody>
                         <tr>
                             <td style="font-size: 30px; text-align:center">
@@ -40,8 +40,8 @@
         </div>
 
         <div name="Logo - Social" class="skyline o_mail_block_header_social">
-            <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #FFFFFF repeat top /100%;border-bottom:3px solid #3bcdc3">
-                <table cellspacing="0" cellpadding="0" width="100%" style="border-collapse:collapse; width:600px">
+            <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #FFFFFF repeat top /100%">
+                <table cellspacing="0" cellpadding="0" style="border-collapse:collapse;border-bottom:3px solid #3bcdc3" width="600" bgcolor="#FFFFFF">
                     <tr>
                         <td valign="center" width="270" style="padding:10px 10px 10px 5px">
                         &amp;nbsp;
@@ -91,7 +91,7 @@
 
         <div name="Text - Social" class="skyline o_mail_block_header_text_social">
             <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #FFFFFF repeat top /100%;border-bottom:3px solid #3bcdc3;color:#37302d">
-                <table cellspacing="0" cellpadding="0" width="100%" style="border-collapse:collapse">
+                <table cellspacing="0" cellpadding="0" width="600" style="border-collapse:collapse" bgcolor="#FFFFFF">
                     <tr>
                         <td valign="center" width="270" style="padding:10px 10px 10px 5px">
                             &amp;nbsp;
@@ -143,7 +143,7 @@
     <xpath expr="//div[@id='email_designer_default_body']/div[2]" position="inside">
         <div name="Title - Subtitle" class="skyline o_mail_block_title_sub">
             <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #fff repeat top /100%;color:#3BCDC3">
-                <table width="100%" cellspacing="0" cellpadding="0" style="border-collapse:collapse;color:inherit">
+                <table width="600" cellspacing="0" cellpadding="0" style="border-collapse:collapse;color:inherit" bgcolor="#ffffff">
                     <tbody>
                         <tr>
                             <td style="text-align:center;padding-bottom:10px">
@@ -162,7 +162,7 @@
 
         <div name="Discount Coupon" class="skyline o_mail_block_discount2">
             <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #FFFFFF repeat top /100%;color:#37302d">
-                <table cellspacing="0" cellpadding="0" style="width:100%;border-collapse:collapse">
+                <table cellspacing="0" cellpadding="0" style="border-collapse:collapse" width="600" bgcolor="#FFFFFF">
                     <tbody>
                         <tr>
                             <td style="text-align:center; padding:20px">
@@ -179,7 +179,7 @@
 
         <div name="Discount Offer" class="skyline o_mail_block_discount1">
             <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #fff repeat top /100%;color:#37302d">
-                <table width="100%" cellspacing="0" cellpadding="0" style="border-collapse:collapse;color:inherit">
+                <table width="600" cellspacing="0" cellpadding="0" style="border-collapse:collapse;color:inherit" bgcolor="#ffffff">
                     <tbody>
                         <tr>
                             <td style="font-size: 45px; font-weight: 900;text-align:center;padding-top:35px">
@@ -216,8 +216,8 @@
         </div>
 
         <div name="Event" class="skyline o_mail_block_event">
-            <div style="padding:0px;width:600px;margin:auto;text-align:center;color:#fff">
-                <table style="width:100%;border-collapse:collapse">
+            <div style="padding:0px;width:600px;margin:auto;color:#fff">
+                <table style="border-collapse:collapse;text-align:center" width="600">
                     <tr>
                         <td class="col_mv bg-color" style="width: 150px;height: 150px;padding: 0;margin: 0;background-color: rgb(139,130,132);text-align:center;vertical-align:middle;color:#fff">
                             <time datetime="2014-07-20"> <span style="display: block;font-size: 50px;line-height: 1;padding-top: 10px">21</span> <span style="display: block;font-size: 30px;line-height: 1">Jul</span> <span style="display: block;font-size: 16px;line-height: 1;color: #fff;font-weight: 600">ALL DAY</span> </time>
@@ -277,7 +277,7 @@
 
         <div name="User Profile" class="skyline o_mail_block_profile">
             <div class="snippet_row" style="padding:0px;width:600px;margin:auto;background: #FFFFFF repeat top /100%;color:#37302d">
-                <table style="padding:20px;border-collapse:collapse;color:inherit">
+                <table style="padding:20px;border-collapse:collapse;color:inherit" width="600" bgcolor="#FFFFFF">
                     <tr>
                         <td style="float:left;padding: 0 30px 0 20px;text-align: center;font-size:14px" class="col_mv">
                             &amp;nbsp;
@@ -297,7 +297,7 @@
 
         <div name="Content Table" class="skyline o_mail_block_table_content">
             <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #FFFFFF repeat top /100%;color:#37302d">
-                <table cellspacing="0" cellpadding="0" style="margin: 0 auto;width:100%;border-collapse:collapse;color:inherit">
+                <table cellspacing="0" cellpadding="0" style="margin: 0 auto;border-collapse:collapse;color:inherit" width="600" bgcolor="#FFFFFF">
                     <tbody>
                         <tr>
                             <td>
@@ -323,7 +323,7 @@
                                         <tbody>
                                             <tr>
                                                 <td>
-                                                    <table cellspacing="0" cellpadding="0" style="width:100%;padding-top:30px;background-color:inherit;border-collapse:collapse" data-max-width="500px">
+                                                    <table cellspacing="0" cellpadding="0" style="padding-top:30px;background-color:inherit;border-collapse:collapse" data-max-width="500px">
                                                         <thead style="color:#37302d;background-color:#3BCDC3">
                                                             <tr class="row col bg-color">
                                                                 <th style="padding: 10px 0px;text-align:center;border-left:none;font-size:14px" class="mv">
@@ -376,7 +376,7 @@
 
         <div name="Two Columns" class="skyline o_mail_block_two_cols">
             <div style="padding:0px;width:600px;margin:auto">
-                <table cellspacing="0" cellpadding="0" style="width:100%;background-color:inherit;border-collapse:collapse">
+                <table cellspacing="0" cellpadding="0" style="background-color:inherit;border-collapse:collapse" width="600">
                     <tbody>
                         <tr>
                             <td style="padding:30px 15px;width:45%;text-align:center;background-color:#fff;color:#37302d;font-size:14px;line-height:1.4" class="col_mv bg-color">
@@ -401,7 +401,7 @@
 
         <div name="Image" class="skyline o_mail_block_image">
             <div class="snippet_row bg-color" style="width:600px;margin:auto;background: #FFFFFF repeat top /100%">
-                <table cellspacing="0" cellpadding="0" style="width:100%;border-collapse:collapse">
+                <table cellspacing="0" cellpadding="0" style="border-collapse:collapse" width="600" bgcolor="#FFFFFF">
                     <tbody>
                         <tr>
                             <td width="100%" align="center" style="text-align:center">
@@ -424,7 +424,7 @@
 
         <div name="Image Text" class="skyline o_mail_block_image_text">
             <div class="mv" style="padding:0px;width:600px;margin:auto;color:#000">
-                <table cellspacing="0" cellpadding="0" style="width:100%;background-color:inherit;border-collapse:collapse">
+                <table cellspacing="0" cellpadding="0" style="background-color:inherit;border-collapse:collapse" width="600">
                     <tbody>
                         <tr>
                             <td style="width:35%;background-color:#fff;text-align:center;vertical-align:middle;width:210px;" class="col_mv bg-color">
@@ -448,7 +448,7 @@
 
         <div name="Button" class="skyline o_mail_block_button">
             <div class="snippet_row bg-color" style="padding:0;width:600px;max-width:600px;margin:0 auto;background: #fff repeat top /100%">
-                <table style="width:600px;text-align:center;margin:0 auto;border-collapse:collapse">
+                <table style="text-align:center;margin:0 auto;border-collapse:collapse" width="600" bgcolor="#ffffff">
                     <tr>
                         <td class="row" style="padding:10px 0;text-align:center">
                             &amp;nbsp;
@@ -462,7 +462,7 @@
 
         <div name="Text Block" class="skyline o_mail_block_simple_text">
             <div class="snippet_row bg-color" style="padding:0;width:600px;max-width:600px;margin:0 auto;background: #fff repeat top /100%;color:#37302d">
-                <table style="width:100%;text-align:justify;margin:0 auto;border-collapse:collapse;color:inherit">
+                <table style="text-align:justify;margin:0 auto;border-collapse:collapse;color:inherit" width="600" bgcolor="#ffffff">
                     <tr>
                         <td style="padding:10px 30px;font-size:14px;line-height:20px">
                             <p style="margin:0">Dear John</p>
@@ -477,8 +477,8 @@
         </div>
 
         <div name="Background Image" class="skyline o_mail_block_text_on_img">
-            <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: url('/website_mail/static/src/img/theme_imgs/skyline_bg.gif') top /cover;background-repeat:no-repeat;color:#fff">
-                <table cellspacing="0" cellpadding="0" style="width:100%;border-collapse:collapse;color:inherit">
+            <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;color:#fff">
+                <table cellspacing="0" cellpadding="0" style="border-collapse:collapse;color:inherit;background:#9E8e94 url('/website_mail/static/src/img/theme_imgs/skyline_bg.gif') top /cover;background-repeat:no-repeat" width="600" bgcolor="#948e94">
                     <tbody>
                         <tr>
                             <td style="padding:30px 30px 0 50px;text-align: left;vertical-align:middle">
@@ -501,7 +501,7 @@
 
         <div name="Steps" class="skyline o_mail_block_steps">
             <div style="padding:0;width:600px;max-width:600px;margin:0 auto">
-                <table style="width:600px;text-align:justify;margin:0 auto;background-color:inherit;border-collapse:collapse">
+                <table style="text-align:justify;margin:0 auto;background-color:inherit;border-collapse:collapse" width="600">
                     <tr>
                         <td style="padding:10px 0;background-color:#3CCDC3;color:#fff" class="col_mv bg-color">
                             <table style="background-color:inherit;border-collapse:collapse">
@@ -557,7 +557,7 @@
     <xpath expr="//div[@id='email_designer_default_extra']/div[2]" position="inside">
         <div name="Separator" class="skyline o_mail_block_footer_seprator">
             <div style="padding:0px;width:600px;margin:auto;background-color:#FFFFFF">
-                <table cellspacing="0" cellpadding="0" style="vertical-align:top;padding:0px;font-family:arial;font-size:12px;color:rgb(51,51,51);background-color:inherit;border-collapse:collapse">
+                <table cellspacing="0" cellpadding="0" style="vertical-align:top;padding:0px;font-family:arial;font-size:12px;color:rgb(51,51,51);background-color:inherit;border-collapse:collapse" width="600" bgcolor="#FFFFFF">
                     <tbody>
                         <tr>
                             <td valign="top" style="width:600px">
@@ -571,7 +571,7 @@
 
         <div name="Tag Line" class="skyline o_mail_block_footer_tag_line">
             <div class="bg-color" style="padding:0px; margin:0 auto;background:#fff;color:#000;width:600px">
-                <table style="margin: 0 auto;background-color:inherit;border-collapse:collapse;color:inherit;color:inherit" cellpadding="0" cellspacing="0">
+                <table style="margin: 0 auto;background-color:inherit;border-collapse:collapse;color:inherit;color:inherit" width="600" bgcolor="#ffffff" cellpadding="0" cellspacing="0">
                     <tbody>
                         <tr>
                             <td valign="center" style="text-align:center;padding:5px">
@@ -588,7 +588,7 @@
         <div name="Social + Text" class="skyline o_mail_block_footer_social">
             <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #C2C2C2 repeat top /100%;color:#37302d">
                 <div style="padding:10px">
-                    <table cellspacing="0" cellpadding="0" style="margin: 0 auto;width:100%;border-collapse:collapse;color:inherit">
+                    <table cellspacing="0" cellpadding="0" style="margin: 0 auto;border-collapse:collapse;color:inherit" width="580" bgcolor="#C2C2C2">
                         <tbody>
                             <tr>
                                 <td style="text-align:center">
@@ -631,7 +631,7 @@
 
         <div name="Text + Copyright" class="skyline o_mail_block_footer_copyright">
             <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #C2C2C2 repeat top /100%">
-                <table cellspacing="0" cellpadding="0" style="margin: 0 auto;width:100%;border-collapse:collapse">
+                <table cellspacing="0" cellpadding="0" style="margin: 0 auto;border-collapse:collapse" width="600" bgcolor="#C2C2C2">
                     <tbody>
                         <tr>
                             <td style="font-size:12px;text-align:center;padding:10px;color:#37302D">
@@ -652,26 +652,24 @@
 
         <div name="Text Only" class="skyline o_mail_block_footer_text">
             <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #C2C2C2 repeat top /100%;color:#37302D">
-                <center>
-                    <table width="600" cellspacing="0" cellpadding="0" border="0" style="margin: 0 auto;width:100%;background-color:inherit;border-collapse:collapse;color:inherit">
-                        <tbody>
-                            <tr>
-                                <td valign="middle" align="right" style="font-size:12px;padding:20px;text-align:center">
-                                    &amp;nbsp;
-                                    <a style="color:#37302D" href="/page/contactus">Contact Us</a> | 
-                                    <t t-if="website.social_facebook">
-                                        <a style="color:#37302D" t-att-href="website.social_facebook">Facebook</a> | 
-                                    </t>
-                                    <t t-if="website.social_twitter">
-                                        <a style="color:#37302D" t-att-href="website.social_twitter">Twitter</a> | 
-                                    </t>
-                                    <a href="/unsubscribe_from_list" style="color:#37302D">Unsubscribe</a>
-                                    &amp;nbsp;
-                                </td>
-                            </tr>
-                        </tbody>
-                    </table>
-                </center>
+                <table width="600" cellspacing="0" cellpadding="0" border="0" style="margin: 0 auto;background-color:inherit;border-collapse:collapse;color:inherit;" bgcolor="#C2C2C2">
+                    <tbody>
+                        <tr>
+                            <td valign="middle" align="right" style="font-size:12px;padding:20px;text-align:center">
+                                &amp;nbsp;
+                                <a style="color:#37302D" href="/page/contactus">Contact Us</a> | 
+                                <t t-if="website.social_facebook">
+                                    <a style="color:#37302D" t-att-href="website.social_facebook">Facebook</a> | 
+                                </t>
+                                <t t-if="website.social_twitter">
+                                    <a style="color:#37302D" t-att-href="website.social_twitter">Twitter</a> | 
+                                </t>
+                                <a href="/unsubscribe_from_list" style="color:#37302D">Unsubscribe</a>
+                                &amp;nbsp;
+                            </td>
+                        </tr>
+                    </tbody>
+                </table>
             </div>
         </div>
     </xpath>
diff --git a/addons/website_mail/views/theme/sunday_snippets.xml b/addons/website_mail/views/theme/sunday_snippets.xml
index aa678507e9d..d9396223762 100644
--- a/addons/website_mail/views/theme/sunday_snippets.xml
+++ b/addons/website_mail/views/theme/sunday_snippets.xml
@@ -5,7 +5,7 @@
     <xpath expr="//div[@id='email_designer_default_headers']/div[2]" position="inside">
         <div name="Center Logo" class="sunday o_mail_block_header_center_logo">
             <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #EFEFEF repeat top /100%">
-                <table style="margin: 0 auto;border-collapse:collapse;width:600px" cellpadding="0" cellspacing="0">
+                <table style="margin: 0 auto;border-collapse:collapse" bgcolor="#EFEFEF" width="600" cellpadding="0" cellspacing="0">
                     <tbody>
                         <tr>
                             <td valign="center" style="text-align:center">
@@ -23,7 +23,7 @@
 
         <div name="Center Text" class="sunday o_mail_block_header_center_text">
             <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #EFEFEF repeat top /100%;color:#414141">
-                <table cellspacing="0" cellpadding="0" style="margin: 0 auto;border-collapse:collapse;width:600px">
+                <table cellspacing="0" cellpadding="0" style="margin: 0 auto;border-collapse:collapse" width="600" bgcolor="#EFEFEF">
                     <tbody>
                         <tr>
                             <td style="font-size: 30px; text-align:center">
@@ -41,7 +41,7 @@
 
         <div name="Logo - Social" class="sunday o_mail_block_header_social">
             <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #EFEFEF repeat top /100%">
-                <table cellspacing="0" cellpadding="0" width="100%" style="border-collapse:collapse;width:600px">
+                <table cellspacing="0" cellpadding="0" style="border-collapse:collapse" width="600" bgcolor="#EFEFEF">
                     <tr>
                         <td valign="center" width="270" style="padding:10px 10px 10px 5px">
                             &amp;nbsp;
@@ -91,7 +91,7 @@
 
         <div name="Text - Social" class="sunday o_mail_block_header_text_social">
             <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #EFEFEF repeat top /100%;color:#414141">
-                <table cellspacing="0" cellpadding="0" width="100%" style="border-collapse:collapse">
+                <table cellspacing="0" cellpadding="0" style="border-collapse:collapse" width="600" bgcolor="#EFEFEF">
                     <tr>
                         <td valign="center" width="270" style="padding:10px 10px 10px 5px">
                             &amp;nbsp;
@@ -143,7 +143,7 @@
     <xpath expr="//div[@id='email_designer_default_body']/div[2]" position="inside">
         <div name="Title - Subtitle" class="sunday o_mail_block_title_sub">
             <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #27aa90 repeat top /100%;color:#fff">
-                <table width="100%" cellspacing="0" cellpadding="0" style="border-collapse:collapse;color:inherit">
+                <table width="600" cellspacing="0" cellpadding="0" style="border-collapse:collapse;color:inherit" bgcolor="#27aa90">
                     <tbody>
                         <tr>
                             <td style="text-align:center">
@@ -162,7 +162,7 @@
 
         <div name="Discount Coupon" class="sunday o_mail_block_discount2">
             <div style="padding:0px;width:600px;margin:auto;background-color:#fff;color:#414141">
-                <table cellspacing="0" cellpadding="0" style="width:100%;background-color:inherit;border-collapse:collapse">
+                <table cellspacing="0" cellpadding="0" style="background-color:inherit;border-collapse:collapse" width="600" bgcolor="#ffffff">
                     <tbody>
                         <tr>
                             <td style="text-align:left; padding-left:20px;vertical-align:middle;color:#414141;font-size:14px" class="col_mv bg-color">
@@ -182,8 +182,8 @@
 
         <div name="Discount Offer" class="sunday o_mail_block_discount1">
             <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #fff repeat top /100%">
-                <div style="padding:0 75px">
-                    <table width="100%" cellspacing="0" cellpadding="0" style="border-collapse:collapse">
+                <div style="padding:0 75px" width="600" bgcolor="#ffffff">
+                    <table width="450" cellspacing="0" cellpadding="0" style="border-collapse:collapse">
                         <tbody>
                             <tr>
                                 <td style="font-size: 45px;font-weight:900;color:#414141;padding-top:35px;text-align:left">
@@ -219,8 +219,8 @@
         </div>
 
         <div name="Event" class="sunday o_mail_block_event">
-            <div style="padding:0px;width:600px;margin:auto;text-align:center;color:#fff">
-                <table style="width:100%;border-collapse:collapse;border-collapse:collapse">
+            <div style="padding:0px;width:600px;margin:auto;color:#fff">
+                <table style="border-collapse:collapse;border-collapse:collapse;text-align:center" width="600">
                     <tr>
                         <td class="col_mv bg-color" style="width: 150px;height: 150px;padding: 0;margin: 0;background-color: #808080;text-align:center;vertical-align:middle;color:#fff">
                             <time datetime="2014-07-20"> <span style="display: block;font-size: 50px;line-height: 1;padding-top: 10px">21</span> <span style="display: block;font-size: 30px;line-height: 1">Jul</span> <span style="display: block;font-size: 16px;line-height: 1;color: #fff;font-weight: 600">ALL DAY</span> </time>
@@ -280,7 +280,7 @@
 
         <div name="User Profile" class="sunday o_mail_block_profile">
             <div class="snippet_row" style="padding:0px;width:600px;margin:auto;background: #FFFFFF repeat top /100%;text-align:center">
-                <table style="padding:20px;border-collapse:collapse;color:inherit">
+                <table style="padding:20px;border-collapse:collapse;color:inherit" width="600" bgcolor="#ffffff">
                     <tr>
                         <td style="float:left;text-align: center;color:#27AA90" class="col_mv bg-color">
                             &amp;nbsp;
@@ -298,7 +298,7 @@
 
         <div name="Content Table" class="sunday o_mail_block_table_content">
             <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #fff repeat top /100%;color:#414141">
-                <table cellspacing="0" cellpadding="0" style="margin: 0 auto;width:100%;border-collapse:collapse">
+                <table cellspacing="0" cellpadding="0" style="margin: 0 auto;border-collapse:collapse" width="600" bgcolor="#ffffff">
                     <tbody>
                         <tr>
                             <td>
@@ -379,7 +379,7 @@
 
         <div name="Two Columns" class="sunday o_mail_block_two_cols">
             <div style="padding:0px;width:600px;margin:auto;background-color:#fff;color:#414141">
-                <table cellspacing="0" cellpadding="0" style="width:100%;background-color:inherit;border-collapse:collapse">
+                <table cellspacing="0" cellpadding="0" style="background-color:inherit;border-collapse:collapse" width="600" bgcolor="#ffffff">
                     <tbody>
                         <tr>
                             <td style="padding:30px 10px 30px 30px;width:45%;text-align:center;color:#414141;font-size:14px" class="col_mv bg-color">
@@ -404,7 +404,7 @@
 
         <div name="Image" class="sunday o_mail_block_image">
             <div class="snippet_row bg-color" style="width:600px;margin:auto;background: #27aa90 repeat top /100%">
-                <table cellspacing="0" cellpadding="0" style="width:100%;border-collapse:collapse">
+                <table cellspacing="0" cellpadding="0" style="border-collapse:collapse" width="600" bgcolor="#27aa90">
                     <tbody>
                         <tr>
                             <td width="100%" align="center" style="text-align:center">
@@ -427,7 +427,7 @@
 
         <div name="Image Text" class="sunday o_mail_block_image_text">
             <div style="padding:0px;width:600px;margin:auto;background-color:#27aa90;color:#414141">
-                <table cellspacing="0" cellpadding="0" style="width:100%;background-color:inherit;border-collapse:collapse">
+                <table cellspacing="0" cellpadding="0" style="background-color:inherit;border-collapse:collapse" width="600" bgcolor="#27aa90">
                     <tbody>
                         <tr>
                             <td style="width:45%;padding-bottom:25px;background-color:#fff;text-align:center;vertical-align:middle;width:210px;" class="col_mv bg-color">
@@ -449,7 +449,7 @@
 
         <div name="Button" class="sunday o_mail_block_button">
             <div class="snippet_row bg-color" style="padding:0;width:600px;max-width:600px;margin:0 auto;background: #fff repeat top /100%">
-                <table style="width:90%;text-align:center;margin:0 auto;border-collapse:collapse;width:600px">
+                <table style="text-align:center;margin:0 auto;border-collapse:collapse" width="600" bgcolor="#ffffff">
                     <tr>
                         <td class="row" style="padding:10px 0;text-align:center">
                             &amp;nbsp;
@@ -463,7 +463,7 @@
 
         <div name="Text Block" class="sunday o_mail_block_simple_text">
             <div class="snippet_row bg-color" style="padding:0;width:600px;max-width:600px;margin:0 auto;background: #fff repeat top /100%;color:#414141">
-                <table style="width:100%;text-align:justify;margin:0 auto;color:inherit;border-collapse:collapse">
+                <table style="text-align:justify;margin:0 auto;color:inherit;border-collapse:collapse" width="600" bgcolor="#ffffff">
                     <tr>
                         <td style="padding:10px 30px;font-size:14px">
                             <p style="margin:0">Dear John</p>
@@ -478,8 +478,8 @@
         </div>
 
         <div name="Background Image" class="sunday o_mail_block_text_on_img">
-            <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: url('/website_mail/static/src/img/theme_imgs/skyline_bg.gif') top /cover;background-repeat:no-repeat;color:#fff">
-                <table cellspacing="0" cellpadding="0" style="width:100%;border-collapse:collapse;color:inherit">
+            <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;color:#fff">
+                <table cellspacing="0" cellpadding="0" style="border-collapse:collapse;color:inherit;background:#948e94 url('/website_mail/static/src/img/theme_imgs/skyline_bg.gif') top /cover;background-repeat:no-repeat" width="600" bgcolor="#948e94">
                     <tbody>
                         <tr>
                             <td style="padding:30px 30px 0 50px;text-align: left;vertical-align:middle">
@@ -502,7 +502,7 @@
 
         <div name="Steps" class="sunday o_mail_block_steps">
             <div style="padding:0;width:600px;max-width:600px;margin:0 auto">
-                <table style="width:100%;text-align:justify;margin:0 auto;border-collapse:collapse">
+                <table style="text-align:justify;margin:0 auto;border-collapse:collapse" width="600">
                     <tr>
                         <td style="padding:10px 0;background-color:#27AA90;color:#fff" class="col_mv bg-color">
                             <table style="background-color:inherit;border-collapse:collapse">
@@ -558,7 +558,7 @@
     <xpath expr="//div[@id='email_designer_default_extra']/div[2]" position="inside">
         <div name="Separator" class="sunday o_mail_block_footer_seprator">
             <div style="padding:0px;width:600px;margin:auto;background-color:#FFFFFF">
-                <table cellspacing="0" cellpadding="0" style="vertical-align:top;padding:0px;font-family:arial;font-size:12px;color:rgb(51,51,51);background-color:inherit;border-collapse:collapse">
+                <table cellspacing="0" cellpadding="0" style="vertical-align:top;padding:0px;font-family:arial;font-size:12px;color:rgb(51,51,51);background-color:inherit;border-collapse:collapse" width="600" bgcolor="#FFFFFF">
                     <tbody>
                         <tr>
                             <td valign="top" style="width:600px">
@@ -572,7 +572,7 @@
 
         <div name="Tag Line" class="sunday o_mail_block_footer_tag_line">
             <div class="bg-color" style="padding:0px;width:600px;margin:auto;background-color:#F5774E;color:#fff">
-                <table style="margin: 0 auto;background-color:inherit;border-collapse:collapse;color:inherit;width:600px" cellpadding="0" cellspacing="0">
+                <table style="margin: 0 auto;background-color:inherit;border-collapse:collapse;color:inherit" width="600" bgcolor="#F5774E" cellpadding="0" cellspacing="0">
                     <tbody>
                         <tr>
                             <td valign="center" style="text-align:center;padding:5px">
@@ -589,7 +589,7 @@
         <div name="Social + Text" class="sunday o_mail_block_footer_social">
             <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #2F2F2F repeat top /100%;color:#EEEEEE">
                 <div style="padding:10px">
-                    <table cellspacing="0" cellpadding="0" style="margin: 0 auto;width:100%;border-collapse:collapse;color:inherit">
+                    <table cellspacing="0" cellpadding="0" style="margin: 0 auto;border-collapse:collapse;color:inherit" width="580" bgcolor="#2F2F2F">
                         <tbody>
                             <tr>
                                 <td style="text-align:center">
@@ -632,7 +632,7 @@
 
         <div name="Text + Copyright" class="sunday o_mail_block_footer_copyright">
             <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #2F2F2F repeat top /100%">
-                <table cellspacing="0" cellpadding="0" style="margin: 0 auto;width:100%;border-collapse:collapse">
+                <table cellspacing="0" cellpadding="0" style="margin: 0 auto;border-collapse:collapse" width="600" bgcolor="#2F2F2F">
                     <tbody>
                         <tr>
                             <td style="font-size:12px;text-align:center;padding:10px;color:#fff">
@@ -653,26 +653,24 @@
 
         <div name="Text Only" class="sunday o_mail_block_footer_text">
             <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #2F2F2F repeat top /100%;color:#fff">
-                <center>
-                    <table width="600" cellspacing="0" cellpadding="0" border="0" style="margin:0 auto;width:100%;border-collapse:collapse;color:inherit">
-                        <tbody>
-                            <tr>
-                                <td valign="middle" align="right" style="font-size:12px;padding:20px;text-align:center">
-                                    &amp;nbsp;
-                                    <a style="color:#fff" href="/page/contactus">Contact Us</a> | 
-                                    <t t-if="website.social_facebook">
-                                        <a style="color:#fff" t-att-href="website.social_facebook">Facebook</a> | 
-                                    </t>
-                                    <t t-if="website.social_twitter">
-                                        <a style="color:#fff" t-att-href="website.social_twitter">Twitter</a> | 
-                                    </t>
-                                    <a href="/unsubscribe_from_list" style="color:#fff">Unsubscribe</a>
-                                    &amp;nbsp;
-                                </td>
-                            </tr>
-                        </tbody>
-                    </table>
-                </center>
+                <table cellspacing="0" cellpadding="0" border="0" style="margin:0 auto;border-collapse:collapse;color:inherit;" width="600" bgcolor="#2F2F2F">
+                    <tbody>
+                        <tr>
+                            <td valign="middle" align="right" style="font-size:12px;padding:20px;text-align:center">
+                                &amp;nbsp;
+                                <a style="color:#fff" href="/page/contactus">Contact Us</a> | 
+                                <t t-if="website.social_facebook">
+                                    <a style="color:#fff" t-att-href="website.social_facebook">Facebook</a> | 
+                                </t>
+                                <t t-if="website.social_twitter">
+                                    <a style="color:#fff" t-att-href="website.social_twitter">Twitter</a> | 
+                                </t>
+                                <a href="/unsubscribe_from_list" style="color:#fff">Unsubscribe</a>
+                                &amp;nbsp;
+                            </td>
+                        </tr>
+                    </tbody>
+                </table>
             </div>
         </div>
     </xpath>
diff --git a/addons/website_mail/views/theme/zenflat_snippets.xml b/addons/website_mail/views/theme/zenflat_snippets.xml
index 75574bf2ff3..194fbbdf5eb 100644
--- a/addons/website_mail/views/theme/zenflat_snippets.xml
+++ b/addons/website_mail/views/theme/zenflat_snippets.xml
@@ -5,7 +5,7 @@
     <xpath expr="//div[@id='email_designer_default_headers']/div[2]" position="inside">
         <div name="Center Logo" class="zenflat o_mail_block_header_center_logo">
             <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #EEEEEE repeat top /100%;color:#008000">
-                <table style="margin: 0 auto;border-collapse:collapse;width:600px" cellpadding="0" cellspacing="0">
+                <table style="margin: 0 auto;border-collapse:collapse" width="600" bgcolor="#EEEEEE" cellpadding="0" cellspacing="0">
                     <tbody>
                         <tr>
                             <td valign="center" style="text-align:center">
@@ -23,7 +23,7 @@
 
         <div name="Center Text" class="zenflat o_mail_block_header_center_text">
             <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #EEEEEE repeat top /100%;color:#008000">
-                <table cellspacing="0" cellpadding="0" style="margin: 0 auto;border-collapse:collapse;width:600px">
+                <table cellspacing="0" cellpadding="0" style="margin: 0 auto;border-collapse:collapse" width="600" bgcolor="#EEEEEE">
                     <tbody>
                         <tr>
                             <td style="font-website_mail/font_to_img: 30px; text-align:center">
@@ -41,7 +41,7 @@
 
         <div name="Logo - Social" class="zenflat o_mail_block_header_social">
             <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #EEEEEE repeat top /100%;color:#008000">
-                <table cellspacing="0" cellpadding="0" style="border-collapse:collapse;width:600px">
+                <table cellspacing="0" cellpadding="0" style="border-collapse:collapse" width="600" bgcolor="#EEEEEE">
                     <tr>
                         <td valign="center" width="270" style="padding:10px 10px 10px 5px">
                             &amp;nbsp;
@@ -91,7 +91,7 @@
 
         <div name="Text - Social" class="zenflat o_mail_block_header_text_social">
             <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #EEEEEE repeat top /100%;color:#008000">
-                <table cellspacing="0" cellpadding="0" style="border-collapse:collapse;width:600px">
+                <table cellspacing="0" cellpadding="0" style="border-collapse:collapse" width="600" bgcolor="#EEEEEE">
                     <tr>
                         <td valign="center" width="270" style="padding-left:5px;font-size:30px">
                             &amp;nbsp;
@@ -143,7 +143,7 @@
     <xpath expr="//div[@id='email_designer_default_body']/div[2]" position="inside">
         <div name="Title - Subtitle" class="zenflat o_mail_block_title_sub">
             <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;color:#008000;background: #FFFFFF repeat top /100%">
-                <table width="100%" cellspacing="0" cellpadding="0" style="color:inherit;border-collapse:collapse">
+                <table width="600" cellspacing="0" cellpadding="0" style="color:inherit;border-collapse:collapse" bgcolor="#FFFFFF">
                     <tbody>
                         <tr>
                             <td style="text-align:center">
@@ -162,7 +162,7 @@
 
         <div name="Content Table" class="zenflat o_mail_block_table_content">
             <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #FFFFFF repeat top /100%;color:#414141">
-                <table cellspacing="0" cellpadding="0" style="margin: 0 auto;width:100%;border-collapse:collapse">
+                <table cellspacing="0" cellpadding="0" style="margin: 0 auto;border-collapse:collapse" width="600" bgcolor="#FFFFFF">
                     <tbody>
                         <tr>
                             <td>
@@ -222,8 +222,8 @@
         </div>
 
         <div name="Event" class="zenflat o_mail_block_event">
-            <div style="padding:0px;width:600px;margin:auto;text-align:center;color:#fff">
-                <table style="width:100%;border-collapse:collapse;border-collapse:collapse">
+            <div style="padding:0px;width:600px;margin:auto;color:#fff">
+                <table style="border-collapse:collapse;border-collapse:collapse;text-align:center" width="600">
                     <tr>
                         <td class="col_mv bg-color" style="width: 150px;height: 150px;padding: 0;margin: 0;background-color:#008000;text-align:center;vertical-align:middle;color:#FFFFFF">
                             <time datetime="2014-07-20"> <span style="display: block;font-size: 50px;line-height: 1;padding-top: 10px">21</span> <span style="display: block;font-size: 30px;line-height: 1">Jul</span> <span style="display: block;font-size: 16px;line-height: 1;color: #fff;font-weight: 600">ALL DAY</span> </time>
@@ -283,7 +283,7 @@
 
         <div name="Discount Offer" class="zenflat o_mail_block_discount1">
             <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #fff repeat top /100%;color:#414141">
-                <table width="100%" cellspacing="0" cellpadding="0" style="border-collapse:collapse">
+                <table width="600" cellspacing="0" cellpadding="0" style="border-collapse:collapse" bgcolor="#ffffff">
                     <tbody>
                         <tr>
                             <td style="font-size: 45px; font-weight: 900; color: #414141;text-align:center;padding-top:35px">
@@ -323,7 +323,7 @@
 
         <div name="Discount Coupon" class="zenflat o_mail_block_discount2">
             <div style="padding:0px;width:600px;margin:auto;background-color:#fff;color:#414141">
-                <table cellspacing="0" cellpadding="0" style="width:100%;background-color:inherit;border-collapse:collapse">
+                <table cellspacing="0" cellpadding="0" style="background-color:inherit;border-collapse:collapse" width="600" bgcolor="#ffffff">
                     <tbody>
                         <tr>
                             <td style="text-align:left; padding-left:30px;vertical-align:middle;color:#414141;font-size:14px" class="col_mv bg-color">
@@ -343,7 +343,7 @@
 
         <div name="Two Columns" class="zenflat o_mail_block_two_cols_content">
             <div class="mv" style="padding:0px;width:600px;margin:auto">
-                <table cellspacing="0" cellpadding="0" style="width:100%;border-collapse:collapse">
+                <table cellspacing="0" cellpadding="0" style="border-collapse:collapse" width="600">
                     <tbody>
                         <tr>
                             <td style="padding:30px 10px 30px 30px;width:45%;text-align:justify;background-color:#008001;color:#fff;font-size:14px" class="col_mv bg-color">
@@ -399,7 +399,7 @@
 
         <div name="User Profile" class="zenflat o_mail_block_profile">
             <div class="snippet_row" style="padding:0;width:600px;margin:auto;background: #fff repeat top /100%;color:#464646">
-                <table style="padding:10px 30px;border-collapse:collapse;width:600px">
+                <table style="padding:10px 30px;border-collapse:collapse" width="600" bgcolor="#ffffff">
                     <tr>
                         <td style="float:left;padding: 0 30px 0 20px;text-align: center;color:#008000;font-size:14px" class="col_mv bg-color">
                             &amp;nbsp;
@@ -424,7 +424,7 @@
 
         <div name="Image - Content" class="zenflat o_mail_block_image_text">
             <div style="padding:0px;width:600px;margin:auto;background-color:#fff;color:#333333;max-width:600px">
-                <table cellspacing="0" cellpadding="0" style="width:100%;background-color:inherit;border-collapse:collapse">
+                <table cellspacing="0" cellpadding="0" style="background-color:inherit;border-collapse:collapse" width="600" bgcolor="#ffffff">
                     <tbody>
                         <tr>
                             <td style="width:45%;padding:15px auto;text-align:center;vertical-align:middle;width:210px;" class="col_mv bg-color">
@@ -448,7 +448,7 @@
 
         <div name="Image" class="zenflat o_mail_block_image">
             <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #fff repeat top /100%;color:#414141">
-                <table width="100%" cellspacing="0" cellpadding="0" style="border-collapse:collapse;color:#37302d">
+                <table width="600" cellspacing="0" cellpadding="0" style="border-collapse:collapse;color:#37302d" bgcolor="#ffffff">
                     <tbody>
                         <tr>
                             <td style="text-align:center;padding:20px 0" >
@@ -469,7 +469,7 @@
 
         <div name="Button" class="zenflat o_mail_block_button">
             <div class="snippet_row bg-color" style="padding:0;width:600px;max-width:600px;margin:0 auto;background: #fff repeat top /100%">
-                <table style="width:600px;text-align:center;margin:0 auto;border-collapse:collapse">
+                <table style="text-align:center;margin:0 auto;border-collapse:collapse" width="600" bgcolor="#ffffff">
                     <tr>
                         <td class="row" style="padding:10px 0;text-align:center">
                             &amp;nbsp;
@@ -483,7 +483,7 @@
 
         <div name="Text Block" class="zenflat o_mail_block_simple_text">
             <div class="snippet_row bg-color" style="padding:0;width:600px;max-width:600px;margin:0 auto;background: #fff repeat top /100%;color:#414141">
-                <table style="width:100%;text-align:justify;margin:0 auto;color:#414141;border-collapse:collapse">
+                <table style="text-align:justify;margin:0 auto;color:#414141;border-collapse:collapse" width="600" bgcolor="#ffffff">
                     <tr>
                         <td style="padding:10px 30px;font-size:14px">
                             <p style="margin:0">Dear John</p>
@@ -498,8 +498,8 @@
         </div>
 
         <div name="Background Image" class="zenflat o_mail_block_text_on_img">
-            <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: url('/website_mail/static/src/img/theme_imgs/skyline_bg.gif') top /cover;background-repeat:no-repeat;color:#fff">
-                <table cellspacing="0" cellpadding="0" style="width:600px;background:inherit;border-collapse:collapse;color:inherit">
+            <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;color:#fff">
+                <table cellspacing="0" cellpadding="0" style="background:inherit;border-collapse:collapse;color:inherit;background:#948e94 url('/website_mail/static/src/img/theme_imgs/skyline_bg.gif') top /cover;background-repeat:no-repeat" width="600" bgcolor="#948e94">
                     <tbody>
                         <tr>
                             <td style="padding:30px 30px 0 50px;text-align: left;vertical-align:middle">
@@ -522,7 +522,7 @@
 
         <div name="Steps" class="zenflat o_mail_block_steps">
             <div style="padding:0;width:600px;max-width:600px;margin:0 auto">
-                <table style="width:100%;text-align:justify;margin:0 auto;border-collapse:collapse">
+                <table style="text-align:justify;margin:0 auto;border-collapse:collapse" width="600">
                     <tr>
                         <td style="padding:10px 0;background-color:#008000;color:#fff" class="col_mv bg-color">
                             <table style="background-color:inherit;border-collapse:collapse">
@@ -578,7 +578,7 @@
     <xpath expr="//div[@id='email_designer_default_extra']/div[2]" position="inside">
         <div name="Separator" class="zenflat o_mail_block_footer_seprator">
             <div style="padding:0px; margin:auto;max-width:600px;background-color:#FFFFFF">
-                <table cellspacing="0" cellpadding="0" style="vertical-align:top;padding:0px;font-family:arial;font-size:12px;color:rgb(51,51,51);background-color:inherit;border-collapse:collapse">
+                <table cellspacing="0" cellpadding="0" style="vertical-align:top;padding:0px;font-family:arial;font-size:12px;color:rgb(51,51,51);background-color:inherit;border-collapse:collapse" width="600" bgcolor="#FFFFFF">
                     <tbody>
                         <tr>
                             <td valign="top" style="width:600px">
@@ -592,7 +592,7 @@
 
         <div name="Tag Line" class="zenflat o_mail_block_footer_tag_line">
             <div class="bg-color" style="padding:0px; margin:auto;background-color:#008000;color:#FFFFFF;max-width:600px">
-                <table style="margin: 0 auto;background-color:inherit;border-collapse:collapse;color:inherit;width:600px" cellpadding="0" cellspacing="0">
+                <table style="margin: 0 auto;background-color:inherit;border-collapse:collapse;color:inherit" width="600" bgcolor="#008000" cellpadding="0" cellspacing="0">
                     <tbody>
                         <tr>
                             <td valign="center" style="text-align:center;padding:5px;color:#FFFFFF">
@@ -609,7 +609,7 @@
         <div name="Social + Text" class="zenflat o_mail_block_footer_social">
             <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #EEEEEE repeat top /100%;color:#414141">
                 <div style="padding:10px">
-                    <table cellspacing="0" cellpadding="0" style="margin: 0 auto;width:600px;border-collapse:collapse">
+                    <table cellspacing="0" cellpadding="0" style="margin: 0 auto;border-collapse:collapse" width="580" bgcolor="#EEEEEE">
                         <tbody>
                             <tr>
                                 <td style="text-align:center ">
@@ -652,7 +652,7 @@
 
         <div name="Text + Copyright" class="zenflat o_mail_block_footer_copyright">
             <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #EEEEEE repeat top /100%">
-                <table cellspacing="0" cellpadding="0" style="margin: 0 auto;width:600px;border-collapse:collapse">
+                <table cellspacing="0" cellpadding="0" style="margin: 0 auto;border-collapse:collapse" width="600" bgcolor="#EEEEEE">
                     <tbody>
                         <tr>
                             <td style="font-size:12px;text-align:center;padding-top:10px;padding-bottom:5px;color:#414141">
@@ -673,26 +673,24 @@
 
         <div name="Text Only" class="zenflat o_mail_block_footer_text">
             <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #EEEEEE repeat top /100%;color:#414141">
-                <center>
-                    <table cellspacing="0" cellpadding="0" border="0" style="margin:0 auto; width:600px;border-collapse:collapse">
-                        <tbody>
-                            <tr>
-                                <td valign="middle" align="right" style="font-size:12px;padding:20px;text-align:center">
-                                    &amp;nbsp;
-                                    <a style="color:#414141" href="/page/contactus">Contact Us</a> | 
-                                    <t t-if="website.social_facebook">
-                                        <a style="color:#414141" t-att-href="website.social_facebook">Facebook</a> | 
-                                    </t>
-                                    <t t-if="website.social_twitter">
-                                        <a style="color:#414141" t-att-href="website.social_twitter">Twitter</a> | 
-                                    </t>
-                                    <a href="/unsubscribe_from_list" style="color:#414141">Unsubscribe</a>
-                                    &amp;nbsp;
-                                </td>
-                            </tr>
-                        </tbody>
-                    </table>
-                </center>
+                <table cellspacing="0" cellpadding="0" border="0" style="margin:0 auto;border-collapse:collapse;" width="600" bgcolor="#EEEEEE">
+                    <tbody>
+                        <tr>
+                            <td valign="middle" align="right" style="font-size:12px;padding:20px;text-align:center">
+                                &amp;nbsp;
+                                <a style="color:#414141" href="/page/contactus">Contact Us</a> | 
+                                <t t-if="website.social_facebook">
+                                    <a style="color:#414141" t-att-href="website.social_facebook">Facebook</a> | 
+                                </t>
+                                <t t-if="website.social_twitter">
+                                    <a style="color:#414141" t-att-href="website.social_twitter">Twitter</a> | 
+                                </t>
+                                <a href="/unsubscribe_from_list" style="color:#414141">Unsubscribe</a>
+                                &amp;nbsp;
+                            </td>
+                        </tr>
+                    </tbody>
+                </table>
             </div>
         </div>
     </xpath>