diff --git a/addons/email_template/email_template_view.xml b/addons/email_template/email_template_view.xml
index 507dae3cd25..97a1b3c9023 100644
--- a/addons/email_template/email_template_view.xml
+++ b/addons/email_template/email_template_view.xml
@@ -110,6 +110,7 @@
             <field name="arch" type="xml">
                 <tree string="Templates">
                     <field name="model_id"/>
+                    <field name="mail_server_id"/>
                     <field name="name"/>
                     <field name="subject"/>
                     <field name="email_from"/>
@@ -138,7 +139,7 @@
                     </group>
                     <newline/>
                     <group expand="0" string="Group by...">
-                        <filter string="SMTP Server" domain="[]" context="{'group_by':'smtp_server_id'}" icon="terp-folder-orange"/>
+                        <filter string="SMTP Server" domain="[]" context="{'group_by':'mail_server_id'}" icon="terp-folder-orange"/>
                         <separator orientation="vertical"/>
                         <filter string="Model" domain="[]" context="{'group_by':'model_id'}" icon="terp-accessories-archiver"/>
                     </group>