diff --git a/addons/website_mail/views/snippets.xml b/addons/website_mail/views/snippets.xml
index e49cf301964..16e23a489b6 100644
--- a/addons/website_mail/views/snippets.xml
+++ b/addons/website_mail/views/snippets.xml
@@ -14,33 +14,214 @@
 
 <div id="snippet_structure" class="tab-pane fade in active">
 
+
     <div data-snippet-id="text-image" data-selector-children=".oe_structure, [data-oe-type=html]">
         <div class="oe_snippet_thumbnail">
             <img class="oe_snippet_thumbnail_img" src="/website/static/src/img/blocks/block_text_image.png"/>
             <span class="oe_snippet_thumbnail_title">Text-Image</span>
         </div>
         <section class="oe_snippet_body">
-            <div class="container">
-                <div class="row">
-                    <div class="col-md-6 mt16">
-                        <h3>A Section Subtitle</h3>
-                        <p>
-                            Write one or two paragraphs describing your product or
-                            services. To be successful your content needs to be
-                            useful to your readers.
-                        </p><p>
-                            Start with the customer – find out what they want
-                            and give it to them.
-                        </p>
-                    </div>
-                    <div class="col-md-6 mt16 mb16">
-                        <img class="img img-responsive shadow" src="/website/static/src/img/text_image.png"/>
-                    </div>
-                </div>
-            </div>
+            <table cellspacing="0" cellpadding="0" style="margin:10px 0px 0px;vertical-align:top;padding:0px;font-family:arial;font-size:12px;color:rgb(51,51,51)">
+                <tbody>
+                    <tr>
+                        <td style="width:580px" valign="top">
+                            <div style="padding:0px 5px">
+                                <table style="font-family:arial;font-size:12px;color:rgb(51,51,51)">
+                                    <tbody>
+                                        <tr>
+                                            <td valign="top">
+                                                <h3>A Section Subtitle</h3>
+                                                <p style="overflow:hidden; font-size:12px">
+                                                    Write one or two paragraphs describing your product,
+                                                    services or a specific feature. To be successful
+                                                    your content needs to be useful to your readers.
+                                                </p><p style="overflow:hidden; font-size:12px">
+                                                    Start with the customer – find out what they want
+                                                    and give it to them.
+                                                </p>
+                                            </td>
+                                            <td width="10"></td>
+                                            <td valign="top" width="283">
+                                                <img width="270" style="display:block;border:none;min-height:263px" alt="" src="/website/static/src/img/text_image.png"/>
+                                            </td>
+                                        </tr>
+                                    </tbody>
+                                </table>
+                            </div>
+                        </td>
+                    </tr>
+                </tbody>
+            </table>
         </section>
     </div>
 
+
+    <div data-snippet-id="image-text" data-selector-children=".oe_structure, [data-oe-type=html]">
+        <div class="oe_snippet_thumbnail">
+            <img class="oe_snippet_thumbnail_img" src="/website/static/src/img/blocks/block_image_text.png"/>
+            <span class="oe_snippet_thumbnail_title">Image-Text</span>
+        </div>
+        <section class="oe_snippet_body">
+            <table cellspacing="0" cellpadding="0" style="margin:10px 0px 0px;vertical-align:top;padding:0px;font-family:arial;font-size:12px;color:rgb(51,51,51)">
+                <tbody>
+                    <tr>
+                        <td style="width:580px" valign="top">
+                            <div style="padding:0px 5px">
+                                <table style="font-family:arial;font-size:12px;color:rgb(51,51,51)">
+                                    <tbody>
+                                        <tr>
+                                            <td valign="top" width="283">
+                                                <img width="270" style="display:block;border:none;min-height:263px" alt="" src="/website/static/src/img/image_text.jpg"/>
+                                            </td>
+                                            <td width="10"></td>
+                                            <td valign="top">
+                                                <h3>A Section Subtitle</h3>
+                                                <p style="overflow:hidden; font-size:12px">
+                                                    Write one or two paragraphs describing your product,
+                                                    services or a specific feature. To be successful
+                                                    your content needs to be useful to your readers.
+                                                </p><p style="overflow:hidden; font-size:12px">
+                                                    Start with the customer – find out what they want
+                                                    and give it to them.
+                                                </p>
+                                            </td>
+                                        </tr>
+                                    </tbody>
+                                </table>
+                            </div>
+                        </td>
+                    </tr>
+                </tbody>
+            </table>
+        </section>
+    </div>
+
+
+    <div data-snippet-id="text-image" data-selector-children=".oe_structure, [data-oe-type=html]">
+        <div class="oe_snippet_thumbnail">
+            <img class="oe_snippet_thumbnail_img" src="/website/static/src/img/blocks/block_jumbotron.png"/>
+            <span class="oe_snippet_thumbnail_title">Big Message</span>
+        </div>
+        <section class="oe_snippet_body">
+            <table cellspacing="0" cellpadding="0" style="margin:10px 0px 0px;vertical-align:top;padding:0px;font-family:arial;font-size:12px;color:rgb(51,51,51)">
+                <tbody>
+                    <tr>
+                        <td valign="top" style="width:580px">
+                            <div style="padding:0px 5px">
+                                <h1>Sell Online. Easily.</h1>
+                                <p style="overflow:hidden">
+                                    Write one sentence to convince visitor about your message.
+                                </p>
+                            </div>
+                        </td>
+                    </tr>
+                </tbody>
+            </table>
+        </section>
+    </div>
+
+
+    <div data-snippet-id="text-image" data-selector-children=".oe_structure, [data-oe-type=html]">
+        <div class="oe_snippet_thumbnail">
+            <img class="oe_snippet_thumbnail_img" src="/website/static/src/img/blocks/block_text_block.png"/>
+            <span class="oe_snippet_thumbnail_title">Text Block</span>
+        </div>
+        <!-- <section class="oe_snippet_body"> -->
+        <div class="oe_snippet_body" style="padding:0px;margin:0px">
+            <table cellspacing="0" cellpadding="0" style="margin:10px 0px 0px;vertical-align:top;padding:0px;font-family:arial;font-size:12px;color:rgb(51,51,51)">
+                <tbody>
+                    <tr>
+                        <td valign="top" style="width:580px">
+                            <h2>
+                                A Great Headline
+                            </h2>
+                            <h3>A good subtitle</h3>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td valign="top" style="width:580px">
+                            <div style="padding:0px 5px">
+                                <p style="overflow:hidden">
+                                    A great way to catch your reader's attention is to tell a story.
+                                    Everything you consider writing can be told as a story.
+                                </p><p style="overflow:hidden">
+                                    <strong>Great stories have personality</strong>. Consider telling 
+                                    a great story that provides personality. Writing a story 
+                                    with personality for potential clients will asist with 
+                                    making a relationship connection. This shows up in small
+                                    quirks like word choices or phrases. Write from your point 
+                                    of view, not from someone else's experience.
+                                </p><p style="overflow:hidden">
+                                    <strong>Great stories are for everyone even when only written for
+                                    just one person</strong>. If you try to write with a wide general
+                                    audience in mind, your story will ring false and be bland. 
+                                    No one will be interested. Write for one person. If it’s genuine for the one, it’s genuine for the rest.
+                                </p>
+
+                            </div>
+                        </td>
+                    </tr>
+                </tbody>
+            </table>
+        <!-- </section> -->
+        </div>
+    </div>
+
+
+    <div data-snippet-id="hr" data-selector-children=".oe_structure, [data-oe-type=html]">
+        <div class="oe_snippet_thumbnail">
+            <img class="oe_snippet_thumbnail_img" src="/website/static/src/img/blocks/block_separator.png"/>
+            <span class="oe_snippet_thumbnail_title">Separator</span>        
+        </div>
+        <div class="oe_snippet_body" style="padding:0px;margin:0px">
+            <table cellspacing="0" cellpadding="0" style="margin:10px 0px 0px;vertical-align:top;padding:0px;font-family:arial;font-size:12px;color:rgb(51,51,51)">
+                <tbody>
+                    <tr>
+                        <td valign="top" style="width:580px">
+                            <div style="padding:0px 5px">
+                                <hr width="100%" style="background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0"/>
+                            </div>
+                        </td>
+                    </tr>
+                </tbody>
+            </table>
+        </div>
+    </div>
+
+
+    <div data-snippet-id="cta" data-selector-children=".oe_structure, [data-oe-type=html]">
+        <div class="oe_snippet_thumbnail">
+            <img class="oe_snippet_thumbnail_img" src="/website/static/src/img/blocks/block_button.png"/>
+            <span class="oe_snippet_thumbnail_title">Button</span>   
+        </div>
+        <div class="oe_snippet_body" style="padding:0px;margin:0px">
+            <table cellspacing="0" cellpadding="0" style="margin:10px 0px 0px;vertical-align:top;padding:0px;font-family:arial;font-size:12px;color:rgb(51,51,51)">   
+                <tbody>
+                    <tr>
+                        <td valign="top" style="width:580px">
+                            <div style="padding:0px 5px">      
+                                <table style="border-top-left-radius:4px;border-top-right-radius:4px;border-bottom-right-radius:4px;border-bottom-left-radius:4px;background-color:rgb(153,153,153);border-collapse:collapse;width:51px;font-family:arial;font-size:12px;color:rgb(51,51,51)" border="0" cellpadding="0" cellspacing="0" align="left">
+                                    <tbody>
+                                        <tr>
+                                            <td style="border-top-left-radius:4px;border-top-right-radius:4px;border-bottom-right-radius:4px;border-bottom-left-radius:4px;padding:15px 5px;border-collapse:collapse;background-color:rgb(101,101,101)" align="center" valign="middle"> 
+                                                <a href="http://r.info.openerp.com/3bbh9o3y3tjskrk.html" style="text-decoration:none;border:none rgb(221,221,221);font-weight:bold;line-height:100%;text-align:center;color:rgb(0,136,204);word-wrap:break-word!important;background-color:rgb(101,101,101)" target="_blank">
+                                                    <span style="color:rgb(255,255,255);font-family:arial;font-size:12px;display:block;width:auto;text-align:center;white-space:nowrap">View Product</span>
+                                                </a>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                        </tr>
+                                    </tbody>
+                                </table>
+                            </div>
+                        </td>
+                    </tr>
+                </tbody>
+            </table>
+        </div>
+    </div>
+
+
 </div>
 
 <div id="snippet_feature" class="tab-pane fade">
@@ -52,6 +233,10 @@
 <div id="snippet_styles" class="hidden">
 </div>
 
+
+
+
+
         </div>
     </div>
 
diff --git a/addons/website_mail/views/website_email_designer.xml b/addons/website_mail/views/website_email_designer.xml
index 3d18e765ead..7969cf435b3 100644
--- a/addons/website_mail/views/website_email_designer.xml
+++ b/addons/website_mail/views/website_email_designer.xml
@@ -10,7 +10,7 @@
         </t>
         <div id="wrap">
             <div class="oe_structure container">
-                <div class="row">
+                <div class="row" style="width: 600px;">
                     <form class="form-horizontal" role="form">
                         <div class="form-group">
                             <label for="email_from" class="col-sm-2 control-label">Email From</label>