diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index 0ade6b9edd0..6da437fd127 100755
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -225,6 +225,13 @@ class crm_email_gateway_server(osv.osv):
         'server_type':lambda * a:'pop',
         'active':lambda * a:True,
     }
+    def onchange_server_type(self, cr, uid, ids, server_type=False, ssl=False):
+        port = 0
+        if server_type == 'pop':
+            port = ssl and 995 or 110
+        elif server_type == 'imap':
+            port = ssl and 993 or 143
+        return {'value':{'port':port}}
 crm_email_gateway_server()
 
 
diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index 3bab7da4f47..1d7c3a4fca5 100755
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -708,12 +708,12 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Email Gateway Server">                    
-                    <field name="server_type" colspan="4"/>
+                    <field name="server_type" colspan="4" on_change="onchange_server_type(server_type,ssl)"/>
                     <field name="name"/>
                     <field name="port" />
                     <field name="login" />
                     <field name="password" password="True"/>
-                    <field name="ssl" />
+                    <field name="ssl" on_change="onchange_server_type(server_type,ssl)"/>
                     <field name="active" />
 
                 </form>