diff --git a/src/plugins/plugin_misc_imap.py b/src/plugins/plugin_misc_imap.py
index 63e28124..b58f2c69 100755
--- a/src/plugins/plugin_misc_imap.py
+++ b/src/plugins/plugin_misc_imap.py
@@ -54,8 +54,8 @@ class IMAP_server():
     params = """
     <params>
     <general>
-    <category name="IMAP Server">
-        <param name="Port" value="10143" type="string" />
+    <category name="Mail Server">
+        <param name="IMAP Port" value="10143" type="string" />
     </category>
     </general>
     </params>
@@ -68,7 +68,7 @@ class IMAP_server():
         #parameters
         host.memory.importParams(self.params)
 
-        port = int(self.host.memory.getParamA("Port", "IMAP Server"))
+        port = int(self.host.memory.getParamA("IMAP Port", "Mail Server"))
         info(_("Launching IMAP server on port %d"), port)
         
         self.server_factory = ImapServerFactory(self.host)
diff --git a/src/plugins/plugin_misc_smtp.py b/src/plugins/plugin_misc_smtp.py
index 9e9be671..1212a003 100755
--- a/src/plugins/plugin_misc_smtp.py
+++ b/src/plugins/plugin_misc_smtp.py
@@ -53,8 +53,8 @@ class SMTP_server():
     params = """
     <params>
     <general>
-    <category name="SMTP Server">
-        <param name="Port" value="10125" type="string" />
+    <category name="Mail Server">
+        <param name="SMTP Port" value="10125" type="string" />
     </category>
     </general>
     </params>
@@ -67,7 +67,7 @@ class SMTP_server():
         #parameters
         host.memory.importParams(self.params)
 
-        port = int(self.host.memory.getParamA("Port", "SMTP Server"))
+        port = int(self.host.memory.getParamA("SMTP Port", "Mail Server"))
         info(_("Launching SMTP server on port %d"), port)
         
         self.server_factory = SmtpServerFactory(self.host)