diff --git a/addons/email_gateway/email_gateway.py b/addons/email_gateway/email_gateway.py
index 14c31c086e2..800f10d823b 100644
--- a/addons/email_gateway/email_gateway.py
+++ b/addons/email_gateway/email_gateway.py
@@ -98,7 +98,7 @@ class mailgate_thread(osv.osv):
         @param uid: the current user’s ID for security checks,
         @param cases: a browse record list
         @param keyword: Case action keyword e.g.: If case is closed "Close" keyword is used
-        @param history: Value True/False, If True it makes entry in case History otherwise in Case Log
+        @param history: Value True/False, If True it makes entry as a Emails Messages otherwise Log Messages
         @param email: Email-To / Recipient address
         @param email_from: Email From / Sender address if any
         @param email_cc: Comma-Separated list of Carbon Copy Emails To addresse if any
diff --git a/addons/email_template/email_template_view.xml b/addons/email_template/email_template_view.xml
index 019d6d1ff1f..201b0af232e 100644
--- a/addons/email_template/email_template_view.xml
+++ b/addons/email_template/email_template_view.xml
@@ -152,8 +152,8 @@
             <field name="search_view_id" ref="view_email_template_search"/>
         </record>
 
-        <menuitem name="Email Templates" id="menu_email_template_all_tools"
-            parent="emails.menu_config_email" action="action_email_template_tree_all" />
+        <menuitem name="Templates" id="menu_email_template_all_tools"
+            parent="emails.menu_email_message_tools" action="action_email_template_tree_all" />
 
         <!-- Inherit email.message view -->
 
@@ -170,4 +170,4 @@
         </record>
 
     </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/emails/email_view.xml b/addons/emails/email_view.xml
index 6e5a558896e..6902faee5f9 100644
--- a/addons/emails/email_view.xml
+++ b/addons/emails/email_view.xml
@@ -106,6 +106,7 @@
             <field name="res_model">email.message</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
+            <field name="domain">[('history', '=', True)]</field>
             <field name="search_view_id" ref="view_email_message_search"/>
         </record>
 
@@ -121,10 +122,10 @@
 	       src_model="email.message"
 	       domain="[('res_id', '=', res_id),('res_model','=',model)]"/>
 
-        <menuitem name="Email Message" id="menu_email_message_tools"
+        <menuitem name="Email" id="menu_email_message_tools"
             parent="base.menu_tools" />
 
-        <menuitem name="Message"
+        <menuitem name="Messages"
             id="menu_email_message"
             parent="menu_email_message_tools"
             action="action_view_mail_message" />
@@ -202,7 +203,7 @@
 
         <menuitem name="Email" id="menu_config_email" parent="base.menu_lunch_survey_root" sequence="20"/>
 
-        <menuitem name="Email Smtp Server" id="menu_email_smtp_server_all" parent="menu_config_email" action="action_email_smtp_server_tree_all"/>
+        <menuitem name="Smtp Server" id="menu_email_smtp_server_all" parent="menu_config_email" action="action_email_smtp_server_tree_all"/>
 
     </data>
-</openerp>
\ No newline at end of file
+</openerp>