diff --git a/addons/email/email_view.xml b/addons/email/email_view.xml
index e1d9532b90d..009a2642c52 100644
--- a/addons/email/email_view.xml
+++ b/addons/email/email_view.xml
@@ -196,7 +196,10 @@
             <field name="search_view_id" ref="view_email_smtp_server_search"/>
         </record>
 
-        <menuitem name="Email Smtp Server" id="menu_email_smtp_server_all" parent="base.menu_lunch_survey_root" action="action_email_smtp_server_tree_all"/>
+        <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"/>
 
     </data>
 </openerp>
diff --git a/addons/email_template/email_template_view.xml b/addons/email_template/email_template_view.xml
index ea3e82c724a..bd8fc616515 100644
--- a/addons/email_template/email_template_view.xml
+++ b/addons/email_template/email_template_view.xml
@@ -154,7 +154,7 @@
         </record>
 
         <menuitem name="Email Templates" id="menu_email_template_all_tools"
-            parent="base.menu_lunch_survey_root" action="action_email_template_tree_all" />
+            parent="email.menu_config_email" action="action_email_template_tree_all" />
 
 	<!-- Inherit email.message view -->
 
diff --git a/addons/fetchmail/fetchmail_view.xml b/addons/fetchmail/fetchmail_view.xml
index b823c586dbf..35685e46e4c 100644
--- a/addons/fetchmail/fetchmail_view.xml
+++ b/addons/fetchmail/fetchmail_view.xml
@@ -116,7 +116,6 @@
 	      <field name="arch" type="xml">
 	          <field name="user_id" position="after">
 	              <field name="server_id" select="1"/>
-	              <field name="ref_id"/>
 	          </field>
 	      </field>
       </record>