diff --git a/root/etc/e-smith/templates/usr/share/mozilla-mcd/thunderbird.conf.php/10All b/root/etc/e-smith/templates/usr/share/mozilla-mcd/thunderbird.conf.php/10All
index 8424464..2eb9e53 100644
--- a/root/etc/e-smith/templates/usr/share/mozilla-mcd/thunderbird.conf.php/10All
+++ b/root/etc/e-smith/templates/usr/share/mozilla-mcd/thunderbird.conf.php/10All
@@ -9,7 +9,9 @@ $OUT .=<<"EOF";
 define('DOMAIN', '$DomainName');
 define('USER_BASE', 'ou=Users,$ldapbase');
 define('IMAP_SERVER', '$SystemName.$DomainName');
+define('IMAP_PORT', '$imaps{'TCPPort'}');
 define('SMTP_SERVER', '$SystemName.$DomainName');
+define('SMTP_PORT', '$ssmtpd{'TCPPort'}');
 define('LDAP_SERVER', 'localhost');
 
 EOF
diff --git a/root/usr/share/mozilla-mcd/thunderbird.php b/root/usr/share/mozilla-mcd/thunderbird.php
index 0fe09af..775a36e 100644
--- a/root/usr/share/mozilla-mcd/thunderbird.php
+++ b/root/usr/share/mozilla-mcd/thunderbird.php
@@ -39,7 +39,7 @@ lockPref("mail.server.server1.userName", "nobody");
 lockPref("mail.smtp.defaultserver", "smtp1");
 lockPref("mail.smtpservers", "smtp1");
 lockPref("mail.smtpserver.smtp1.try_ssl", 3);
-lockPref("mail.smtpserver.smtp1.port", 465);
+lockPref("mail.smtpserver.smtp1.port", <?php echo SMTP_PORT; ?>);
 lockPref("mail.smtpserver.smtp1.hostname", "<?php echo SMTP_SERVER; ?>");
 lockPref("mail.smtpserver.smtp1.username", "<?php echo $uid; ?>");
 
@@ -59,7 +59,7 @@ $identities = ''
 lockPref("mail.account.account2.server", "server<?php echo $server?>");
 lockPref("mail.server.server2.hostname", "<?php echo IMAP_SERVER; ?>");
 lockPref("mail.server.server2.name", "<?php echo $user[0]['mail'][0]; ?>");
-lockPref("mail.server.server2.port", 993);
+lockPref("mail.server.server2.port", <?php echo IMAP_PORT; ?>);
 lockPref("mail.server.server2.socketType", 3);
 lockPref("mail.server.server2.type", "imap");
 lockPref("mail.server.server2.userName", "<?php echo $uid; ?>");