From 904809459d8cd0e92f63fb2f50ab5f6bd1b9493e Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Wed, 21 Jul 2010 07:55:20 +0000
Subject: [PATCH] Fix default IMAP port configuration (#1486864)

---
 CHANGELOG                  | 2 ++
 program/include/rcmail.php | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index 4c66adba5..28abdf8b7 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,8 @@
 CHANGELOG RoundCube Webmail
 ===========================
 
+- Fix default IMAP port configuration (#1486864)
+- Create Sent folder when starting to compose a new message (#1486802)
 - Fix handling of messages with Content-Type: application/* and no filename (#1484050)
 - Improved compose screen: resizable body and attachments list, vertical splitter, options menu
 - Fix RC forgets search results (#1483883)
diff --git a/program/include/rcmail.php b/program/include/rcmail.php
index d644f4f09..3fa2fa2cc 100644
--- a/program/include/rcmail.php
+++ b/program/include/rcmail.php
@@ -585,7 +585,7 @@ class rcmail
       $imap_ssl = (isset($a_host['scheme']) && in_array($a_host['scheme'], array('ssl','imaps','tls'))) ? $a_host['scheme'] : null;
       if(!empty($a_host['port']))
         $imap_port = $a_host['port'];
-      else if ($imap_ssl && $imap_ssl != 'tls')
+      else if ($imap_ssl && $imap_ssl != 'tls' && (!$config['default_port'] || $config['default_port'] == 143))
         $imap_port = 993;
     }