diff --git a/addons/mail/mail_thread_view.xml b/addons/mail/mail_thread_view.xml
index b568cacfa53..9e6a9ad1feb 100644
--- a/addons/mail/mail_thread_view.xml
+++ b/addons/mail/mail_thread_view.xml
@@ -21,12 +21,11 @@
             }""/>
             <field name="help" type="html">
                 <p>
-                    <b>Hurray! No message here!</b>
+                    <b>Good Job! Your inbox is empty.</b>
                 </p><p>
-                    Congratulations! You have processed all your incoming emails.
-                    Remember that when you receive new messages, you can either
-                    set them as done, or use the star button to send those messages
-                    into your <i>Todo</i> mailbox.
+                    Your inbox contains private messages or emails sent to you
+                    as well as information related to documents or people you
+                    follow.
                 </p>
             </field>
         </record>
@@ -46,12 +45,9 @@
                 'read_action': 'read', }&quot;"/>
             <field name="help" type="html">
                 <p>
-                    No message here!
+                    <b>No private message.</b>
                 </p><p>
-                    There are no new messages matching the current search
-                    that were directly sent to you.
-                    Remember you can always uncheck the Read filter to see
-                    messages sent to you that you already read.
+                    This list contains messages sent to you.
                 </p>
             </field>
         </record>
@@ -71,12 +67,9 @@
                 'read_action': 'read', }&quot;"/>
             <field name="help" type="html">
                 <p>
-                    <b>Hurray! No message here!</b>
+                    <b>You did it!</b>
                 </p><p>
-                    Congratulations! You have processed all your messages in
-                    your todo list, or at least those matching your search.
-                    Remember you can always search for read messages by
-                    unchecking the Read filter.
+                    No more todo.
                 </p>
             </field>
         </record>
@@ -95,7 +88,7 @@
                 'read_action': 'unread', }&quot;"/>
             <field name="help" type="html">
                 <p>
-                    There are no message for this search.
+                    No message found.
                 </p>
             </field>
         </record>
@@ -112,7 +105,10 @@
                 'view_mailbox': True, }&quot;"/>
             <field name="help" type="html">
                 <p>
-                    There are no message for this search.
+                    <b>No message sent yet.</b>
+                </p><p>
+                    Click on the top-right icon to compose a message. This
+                    message will be sent by email if it's an internal contact.
                 </p>
             </field>
         </record>
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index d951a09cbb5..e214168cb25 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -1281,7 +1281,7 @@ openerp.mail = function (session) {
                 this.compose_message.do_show_compact();
             }
 
-            this.$('.oe_wall_no_message').remove();
+            this.$('.oe_view_nocontent').remove();
 
 
             if (dom_insert_after) {
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index c868319c58e..2ba1733043a 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -163,7 +163,7 @@
         display message on the wall when there are no message
         -->
     <t t-name="mail.wall_no_message">
-        <div class="oe_wall_no_message">You have no messages</div>
+        <div class="oe_view_nocontent">No messages.</div>
     </t>
 
     <!--