SMTPS support and minor bugfixes

13 files changed, 237 insertions, 197 deletions

diff --git a/CHANGELOG b/CHANGELOG
index c534d5680..0832ed543 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -80,4 +80,4 @@ CHANGELOG RoundCube Webmail
 - Added Reply-To-All functionality (Request #1326395, Patch #1349777)
 - Redesign of client side AJAX code (enable multi threading)
 - Added keep-alive signal every minute
-
+- Added support for SMTPS
diff --git a/config/main.inc.php.dist b/config/main.inc.php.dist
index 2910bb088..2220a57ee 100644
--- a/config/main.inc.php.dist
+++ b/config/main.inc.php.dist
@@ -37,10 +37,11 @@ $rcmail_config['default_host'] = '';
 $rcmail_config['default_port'] = 143;
 
 // use this host for sending mails.
+// to use SSL connection, set ssl://smtp.host.com
 // if left blank, the PHP mail() function is used
 $rcmail_config['smtp_server'] = '';
 
-// SMTP port (default is 25)
+// SMTP port (default is 25; 465 for SSL)
 $rcmail_config['smtp_port'] = 25;
 
 // SMTP username (if required) if you use %u as the username RoundCube
@@ -68,6 +69,9 @@ $rcmail_config['skin_path'] = 'skins/default/';
 // use this folder to store temp files (must be writebale for apache user)
 $rcmail_config['temp_dir'] = 'temp/';
 
+// use this folder to store log files (must be writebale for apache user)
+$rcmail_config['log_dir'] = 'logs/';
+
 // session lifetime in minutes
 $rcmail_config['session_lifetime'] = 10;
 
diff --git a/program/include/bugs.inc b/program/include/bugs.inc
index d67281ef3..c9116d5a2 100644
--- a/program/include/bugs.inc
+++ b/program/include/bugs.inc
@@ -63,8 +63,12 @@ function log_bug($arg_arr)
                  $arg_arr['message'],
                  $arg_arr['file'],
                  $arg_arr['line']);
-
-    if ($fp = fopen($INSTALL_PATH.'logs/errors', 'a'))
+                 
+    if (empty($CONFIG['log_dir']))
+      $CONFIG['log_dir'] = $INSTALL_PATH.'logs';
+      
+    if ($fp = fopen($CONFIG['log_dir'].'/errors', 'a'))
+    
       {
       fwrite($fp, $log_entry);
       fclose($fp);
diff --git a/program/include/main.inc b/program/include/main.inc
index adb0b8822..306d2105e 100644
--- a/program/include/main.inc
+++ b/program/include/main.inc
@@ -40,12 +40,16 @@ function rcmail_startup($task='mail')
   include_once('config/db.inc.php');
   $CONFIG = array_merge($CONFIG, $rcmail_config);
 
+  if (empty($CONFIG['log_dir']))
+    $CONFIG['log_dir'] = $INSTALL_PATH.'logs';
+  else
+    $CONFIG['log_dir'] = ereg_replace('\/$', '', $CONFIG['log_dir']);
 
   // set PHP error logging according to config
   if ($CONFIG['debug_level'] & 1)
     {
     ini_set('log_errors', 1);
-    ini_set('error_log', $INSTALL_PATH.'logs/errors');  
+    ini_set('error_log', $CONFIG['log_dir'].'/errors');
     }
   if ($CONFIG['debug_level'] & 4)
     ini_set('display_errors', 1);
diff --git a/program/include/rcube_shared.inc b/program/include/rcube_shared.inc
index edf19b66e..9b1b23bf6 100644
--- a/program/include/rcube_shared.inc
+++ b/program/include/rcube_shared.inc
@@ -1146,6 +1146,8 @@ EOF;
   // perform utf-8 decoding
   if ($utf8_decode && function_exists('utf8ToUnicodeEntities'))
     $text = utf8ToUnicodeEntities($text);
+  else if ($utf8_decode)
+    $OUTPUT->set_charset('UTF-8');
 
 
   // format output
@@ -1206,7 +1208,7 @@ function rep_specialchars_output($str, $enctype='', $mode='', $newlines=TRUE)
     {
     if (!$html_encode_arr)
       {
-      $html_encode_arr = get_html_translation_table(HTML_ENTITIES); // HTML_SPECIALCHARS
+      $html_encode_arr = get_html_translation_table(HTML_SPECIALCHARS); // HTML_ENTITIES
       $html_encode_arr[chr(128)] = '€';
       unset($html_encode_arr['?']);
       unset($html_encode_arr['&']);
@@ -1238,10 +1240,12 @@ function rep_specialchars_output($str, $enctype='', $mode='', $newlines=TRUE)
   // if the replace tables for RTF, XML and JS are not yet defined
   if (!$js_rep_table)
     {
+    $js_rep_table = $rtf_rep_table = $xml_rep_table = array();
+
     for ($c=160; $c<256; $c++)  // can be increased to support more charsets
       {
       $hex = dechex($c);
-      $js_rep_table[Chr($c)] = sprintf("\u%s%s", str_repeat('0', 4-strlen($hex)), $hex);
+      //$js_rep_table[Chr($c)] = sprintf("\u%s%s", str_repeat('0', 4-strlen($hex)), $hex);
       $rtf_rep_table[Chr($c)] = "\\'$hex";
       $xml_rep_table[Chr($c)] = "&#$c;";
       }
diff --git a/program/include/rcube_smtp.inc b/program/include/rcube_smtp.inc
index e5691759c..e4aea09d2 100644
--- a/program/include/rcube_smtp.inc
+++ b/program/include/rcube_smtp.inc
@@ -53,12 +53,26 @@ function smtp_mail($from, $recipients, $headers, &$body)
   {
   global $SMTP_CONN, $CONFIG, $SMTP_ERROR;
   $smtp_timeout = null;
+  $smtp_host = $CONFIG['smtp_server'];
   $smtp_port = is_numeric($CONFIG['smtp_port']) ? $CONFIG['smtp_port'] : 25;
+  $smtp_host_url = parse_url($CONFIG['smtp_server']);
   
+  // overwrite port
+  if ($smtp_host_url['host'] && $smtp_host_url['port'])
+    {
+    $smtp_host = $smtp_host_url['host'];
+    $smtp_port = $smtp_host_url['port'];
+    }
+
+  // re-write smtp host
+  if ($smtp_host_url['host'] && $smtp_host_url['scheme'])
+    $smtp_host = sprintf('%s://%s', $smtp_host_url['scheme'], $smtp_host_url['host']);
+
+
   // create Net_SMTP object and connect to server
   if (!is_object($smtp_conn))
     {
-    $SMTP_CONN = new Net_SMTP($CONFIG['smtp_server'], $smtp_port, 'localhost');
+    $SMTP_CONN = new Net_SMTP($smtp_host, $smtp_port, 'localhost');
 
     // set debugging
     if ($CONFIG['debug_level'] & 8)
diff --git a/program/localization/el/labels.inc b/program/localization/el/labels.inc
index 929ce1109..e331d2038 100755
--- a/program/localization/el/labels.inc
+++ b/program/localization/el/labels.inc
@@ -18,166 +18,164 @@
 
 */
 
-$utf8_decoding = TRUE;
-
 $labels = array();
 
 // login page
-$labels['username']  = 'Όνομα χρήστη';
-$labels['password']  = 'Κωδικός πρόσβασης';
-$labels['server']    = 'Διακομιστής';
-$labels['login']     = 'Είσοδος';
+$labels['username']  = '����� ������';
+$labels['password']  = '������� ���������';
+$labels['server']    = '�����������';
+$labels['login']     = '�������';
 
 // taskbar
-$labels['logout']   = 'Αποσύνδεση';
+$labels['logout']   = '����������';
 $labels['mail']     = 'E-Mail';
-$labels['settings'] = 'Προσωπικές ρυθμίσεις';
-$labels['addressbook'] = 'Βιβλίο διευθύνσεων';
+$labels['settings'] = '���������� ���������';
+$labels['addressbook'] = '������ �����������';
 
 // mailbox names
-$labels['inbox']  = 'Εισερχόμενα';
-$labels['sent']   = 'Απεσταλμένα';
-$labels['trash']  = 'Κάδος αχρήστων';
-$labels['drafts'] = 'Προσχέδια';
-$labels['junk']   = '’χρηστα';
+$labels['inbox']  = '�����������';
+$labels['sent']   = '�����������';
+$labels['trash']  = '����� ��������';
+$labels['drafts'] = '���������';
+$labels['junk']   = '�������';
 
 // message listing
-$labels['subject'] = 'Θέμα';
-$labels['nosubject']  = '(χωρίς θέμα)';
-$labels['from']    = 'Αποστολέας';
-$labels['to']      = 'Παραλήπτης';
-$labels['cc']      = 'Κοινοποίηση';
-$labels['bcc']     = 'Κρυφή κοινοποίηση';
-$labels['replyto'] = 'Απάντηση προς';
-$labels['replytoallmessage'] = 'Απάντηση προς τον αποστολέα και προς όλους τους παραλήπτες';
-$labels['date']    = 'Ημερομηνία';
-$labels['size']    = 'Μέγεθος';
-$labels['priority'] = 'Προτεραιότητα';
-$labels['organization'] = 'Οργανισμός';
-$labels['sortby']   = 'Ταξινόμηση κατά';
-$labels['sortasc']  = 'Αύξουσα ταξινόμηση';
-$labels['sortdesc'] = 'Φθίνουσα ταξινόμηση';
+$labels['subject'] = '����';
+$labels['nosubject']  = '(����� ����)';
+$labels['from']    = '����������';
+$labels['to']      = '����������';
+$labels['cc']      = '�����������';
+$labels['bcc']     = '����� �����������';
+$labels['replyto'] = '�������� ����';
+$labels['replytoallmessage'] = '�������� ���� ��� ��������� ��� ���� ����� ���� ����������';
+$labels['date']    = '����������';
+$labels['size']    = '�������';
+$labels['priority'] = '�������������';
+$labels['organization'] = '����������';
+$labels['sortby']   = '���������� ����';
+$labels['sortasc']  = '������� ����������';
+$labels['sortdesc'] = '�������� ����������';
 
 // aliases
-$labels['reply-to'] = $labels['Απάντηση προς'];
+$labels['reply-to'] = $labels['�������� ����'];
 
-$labels['mailboxlist'] = 'Φάκελοι';
-$labels['messagesfromto'] = 'Μηνύματα $from έως $to από $count';
-$labels['messagenrof'] = 'Μήνυμα $nr από $count';
+$labels['mailboxlist'] = '�������';
+$labels['messagesfromto'] = '�������� $from ��� $to ��� $count';
+$labels['messagenrof'] = '������ $nr ��� $count';
 
-$labels['moveto']   = 'Μετακίνηση σε...';
-$labels['download'] = 'Λήψη';
+$labels['moveto']   = '���������� ��...';
+$labels['download'] = '����';
 
-$labels['filename'] = 'Όνομα αρχείου';
-$labels['filesize'] = 'Μέγεθος αρχείου';
+$labels['filename'] = '����� �������';
+$labels['filesize'] = '������� �������';
 
-$labels['preferhtml'] = 'Προτιμάται HTML';
-$labels['htmlmessage'] = 'Μήνυμα HTML';
-$labels['prettydate'] = 'Μορφοποιημένες ημερομηνίες';
+$labels['preferhtml'] = '���������� HTML';
+$labels['htmlmessage'] = '������ HTML';
+$labels['prettydate'] = '�������������� �����������';
 
-$labels['addtoaddressbook'] = 'Προσθήκη στο βιβλίο διευθύνσεων';
+$labels['addtoaddressbook'] = '�������� ��� ������ �����������';
 
 // weekdays short
-$labels['sun'] = 'Κυρ';
-$labels['mon'] = 'Δευ';
-$labels['tue'] = 'Τρι';
-$labels['wed'] = 'Τετ';
-$labels['thu'] = 'Πεμ';
-$labels['fri'] = 'Παρ';
-$labels['sat'] = 'Σαβ';
+$labels['sun'] = '���';
+$labels['mon'] = '���';
+$labels['tue'] = '���';
+$labels['wed'] = '���';
+$labels['thu'] = '���';
+$labels['fri'] = '���';
+$labels['sat'] = '���';
 
 // weekdays long
-$labels['sunday']    = 'Κυριακή';
-$labels['monday']    = 'Δευτέρα';
-$labels['tuesday']   = 'Τρίτη';
-$labels['wednesday'] = 'Τετάρτη';
-$labels['thursday']  = 'Πέμπτη';
-$labels['friday']    = 'Παρασκευή';
-$labels['saturday']  = 'Σάββατο';
+$labels['sunday']    = '�������';
+$labels['monday']    = '�������';
+$labels['tuesday']   = '�����';
+$labels['wednesday'] = '�������';
+$labels['thursday']  = '������';
+$labels['friday']    = '���������';
+$labels['saturday']  = '�������';
 
-$labels['today'] = 'Σήμερα';
+$labels['today'] = '������';
 
 // toolbar buttons
-$labels['writenewmessage']  = 'Δημιουργία νέου μηνύματος';
-$labels['replytomessage']   = 'Απάντηση μηνύματος';
-$labels['forwardmessage']   = 'Προώθηση μηνύματος';
-$labels['deletemessage']    = 'Μεταφορά του μηνύματος στον κάδο αχρήστων';
-$labels['printmessage']     = 'Εκτύπωση μηνύματος';
-$labels['previousmessages'] = 'Εμφάνιση προηγουμένων μηνυμάτων';
-$labels['nextmessages']     = 'Εμφάνιση επομένων μηνυμάτων';
-$labels['backtolist']       = 'Επιστροφή στη λίστα μηνυμάτων';
-$labels['viewsource']       = 'Προβολή προέλευσης';
-
-$labels['select'] = 'Επιλογή';
-$labels['all'] = 'Όλα';
-$labels['none'] = 'Κανένα';
-$labels['unread'] = 'Αδιάβαστα';
+$labels['writenewmessage']  = '���������� ���� ���������';
+$labels['replytomessage']   = '�������� ���������';
+$labels['forwardmessage']   = '�������� ���������';
+$labels['deletemessage']    = '�������� ��� ��������� ���� ���� ��������';
+$labels['printmessage']     = '�������� ���������';
+$labels['previousmessages'] = '�������� ������������ ���������';
+$labels['nextmessages']     = '�������� �������� ���������';
+$labels['backtolist']       = '��������� ��� ����� ���������';
+$labels['viewsource']       = '������� ����������';
+
+$labels['select'] = '�������';
+$labels['all'] = '���';
+$labels['none'] = '������';
+$labels['unread'] = '���������';
 
 // message compose
-$labels['compose']  = 'Σύνθεση μηνύματος';
-$labels['sendmessage']  = 'Αποστολή του μηνύματος τώρα';
-$labels['addattachment']  = 'Επισύναψη αρχείου';
-$labels['attachments'] = 'Συνημμένα';
-$labels['upload'] = 'Αποστολή';
-$labels['close']  = 'Κλείσιμο';
+$labels['compose']  = '������� ���������';
+$labels['sendmessage']  = '�������� ��� ��������� ����';
+$labels['addattachment']  = '��������� �������';
+$labels['attachments'] = '���������';
+$labels['upload'] = '��������';
+$labels['close']  = '��������';
 
-$labels['low']     = 'Χαμηλή';
-$labels['lowest']  = 'Χαμηλότατη';
-$labels['normal']  = 'Κανονική';
-$labels['high']    = 'Υψηλή';
-$labels['highest'] = 'Ύψιστη';
+$labels['low']     = '������';
+$labels['lowest']  = '����������';
+$labels['normal']  = '��������';
+$labels['high']    = '�����';
+$labels['highest'] = '������';
 
-$labels['showimages'] = 'Εμφάνιση εικόνων';
+$labels['showimages'] = '�������� �������';
 
 
 // address boook
-$labels['name']      = 'Εμφάνιση ονόματος';
-$labels['firstname'] = 'Όνομα';
-$labels['surname']   = 'Επώνυμο';
-$labels['email']     = 'Διεύθυνση e-mail';
+$labels['name']      = '�������� ��������';
+$labels['firstname'] = '�����';
+$labels['surname']   = '�������';
+$labels['email']     = '��������� e-mail';
 
-$labels['addcontact'] = 'Προσθήκη νέας επαφής';
-$labels['editcontact'] = 'Επεξεργασία επαφής';
+$labels['addcontact'] = '�������� ���� ������';
+$labels['editcontact'] = '����������� ������';
 
-$labels['edit']   = 'Επεξεργασία';
-$labels['cancel'] = '’κυρο';
-$labels['save']   = 'Αποθήκευση';
-$labels['delete'] = 'Διαγραφή';
+$labels['edit']   = '�����������';
+$labels['cancel'] = '�����';
+$labels['save']   = '����������';
+$labels['delete'] = '��������';
 
-$labels['newcontact']     = 'Δημιουργία νέας κάρτας επαφής';
-$labels['deletecontact']  = 'Διαγραφή επιλεγμένων επαφών';
-$labels['composeto']      = 'Σύνθεση μηνύματος προς';
-$labels['contactsfromto'] = 'Επαφές $from έως $to από $count';
-$labels['print']          = 'Εκτύπωση';
-$labels['export']         = 'Εξαγωγή';
+$labels['newcontact']     = '���������� ���� ������ ������';
+$labels['deletecontact']  = '�������� ����������� ������';
+$labels['composeto']      = '������� ��������� ����';
+$labels['contactsfromto'] = '������ $from ��� $to ��� $count';
+$labels['print']          = '��������';
+$labels['export']         = '�������';
 
 
 // settings
-$labels['settingsfor']  = 'Ρυθμίσεις για';
-
-$labels['preferences']  = 'Προτιμήσεις';
-$labels['userpreferences']  = 'Προτιμήσεις χρήστη';
-$labels['editpreferences']  = 'Επεξεργασία προτιμήσεων χρήστη';
-
-$labels['identities']  = 'Ταυτότητες';
-$labels['manageidentities']  = 'Διαχείριση ταυτοτήτων αυτού του λογαριασμού';
-$labels['newidentity']  = 'Νέα ταυτότητα';
-
-$labels['newitem']  = 'Νέο αντικείμενο';
-$labels['edititem']  = 'Επεξεργασία αντικειμένου';
-
-$labels['setdefault']  = 'Ορισμός προεπιλογών';
-$labels['language']  = 'Γλώσσα';
-$labels['timezone']  = 'Ζώνη ώρας';
-$labels['pagesize']  = 'Γραμμές ανά σελίδα';
-
-$labels['folders']  = 'Φάκελοι';
-$labels['foldername']  = 'Όνομα φακέλου';
-$labels['subscribed']  = 'Εγγεγραμμένοι φάκελοι';
-$labels['create']  = 'Δημιουργία';
-$labels['createfolder']  = 'Δημιουργία νέου φακέλου';
-$labels['deletefolder']  = 'Διαγραφή φακέλου';
-$labels['managefolders']  = 'Διαχείριση φακέλων';
+$labels['settingsfor']  = '��������� ���';
+
+$labels['preferences']  = '�����������';
+$labels['userpreferences']  = '����������� ������';
+$labels['editpreferences']  = '����������� ����������� ������';
+
+$labels['identities']  = '����������';
+$labels['manageidentities']  = '���������� ���������� ����� ��� �����������';
+$labels['newidentity']  = '��� ���������';
+
+$labels['newitem']  = '��� �����������';
+$labels['edititem']  = '����������� ������������';
+
+$labels['setdefault']  = '������� �����������';
+$labels['language']  = '������';
+$labels['timezone']  = '���� ����';
+$labels['pagesize']  = '������� ��� ������';
+
+$labels['folders']  = '�������';
+$labels['foldername']  = '����� �������';
+$labels['subscribed']  = '������������� �������';
+$labels['create']  = '����������';
+$labels['createfolder']  = '���������� ���� �������';
+$labels['deletefolder']  = '�������� �������';
+$labels['managefolders']  = '���������� �������';
 
 
 ?>
\ No newline at end of file
diff --git a/program/localization/el/messages.inc b/program/localization/el/messages.inc
index 0b07a5ea2..d433bff32 100755
--- a/program/localization/el/messages.inc
+++ b/program/localization/el/messages.inc
@@ -17,65 +17,64 @@
  $Id$
 
 */
-$utf8_decoding = TRUE;
 
 $messages = array();
 
-$messages['loginfailed']  = 'Η είσοδος απέτυχε';
+$messages['loginfailed']  = '� ������� �������';
 
-$messages['cookiesdisabled'] = 'Ο φυλλομετρητής σας δεν υποστηρίζει cookies';
+$messages['cookiesdisabled'] = '� ������������� ��� ��� ����������� cookies';
 
-$messages['sessionerror'] = 'Η σύνοδος σας δεν είναι έγκυρη ή έχει λήξει';
+$messages['sessionerror'] = '� ������� ��� ��� ����� ������ � ���� �����';
 
-$messages['imaperror'] = 'Η σύνδεση με τον διακομιστή IMAP απέτυχε';
+$messages['imaperror'] = '� ������� �� ��� ���������� IMAP �������';
 
-$messages['nomessagesfound'] = 'Δεν βρέθηκαν μηνύματα σε αυτό το γραμματοκιβώτιο';
+$messages['nomessagesfound'] = '��� �������� �������� �� ���� �� ���������������';
 
-$messages['loggedout'] = 'Έχετε αποσυνδεθεί επιτυχώς. Αντίο!';
+$messages['loggedout'] = '����� ����������� ��������. �����!';
 
-$messages['mailboxempty'] = 'Το γραμματοκιβώτιο είναι άδειο';
+$messages['mailboxempty'] = '�� ��������������� ����� �����';
 
-$messages['loading'] = 'Φόρτωση...';
+$messages['loading'] = '�������...';
 
-$messages['loadingdata'] = 'Φόρτωση δεδομένων...';
+$messages['loadingdata'] = '������� ���������...';
 
-$messages['sendingmessage'] = 'Αποστολή μηνύματος...';
+$messages['sendingmessage'] = '�������� ���������...';
 
-$messages['messagesent'] = 'Το μήνυμα στάλθηκε επιτυχώς';
+$messages['messagesent'] = '�� ������ �������� ��������';
 
-$messages['successfullysaved'] = 'Αποθηκεύτηκε επιτυχώς';
+$messages['successfullysaved'] = '������������ ��������';
 
-$messages['addedsuccessfully'] = 'Η επαφή προστέθηκε επιτυχώς στο βιβλίο διευθύνσεων';
+$messages['addedsuccessfully'] = '� ����� ���������� �������� ��� ������ �����������';
 
-$messages['contactexists'] = 'Υπάρχει ήδη επαφή με αυτή τη διεύθυνση e-mail';
+$messages['contactexists'] = '������� ��� ����� �� ���� �� ��������� e-mail';
 
-$messages['blockedimages'] = 'Για τη δική σας προστασία, έχουν μπλοκαριστεί οι απομακρυσμένες εικόνες που έχει αυτό το μήνυμα.';
+$messages['blockedimages'] = '��� �� ���� ��� ���������, ����� ������������ �� �������������� ������� ��� ���� ���� �� ������.';
 
-$messages['encryptedmessage'] = 'Αυτό είναι ένα κρυπτογραφημένο μήνυμα και δεν μπορεί να εμφανιστεί. Συγνώμη!';
+$messages['encryptedmessage'] = '���� ����� ��� ��������������� ������ ��� ��� ������ �� ����������. �������!';
 
-$messages['noemailwarning']    = 'Παρακαλώ εισάγετε μια έγκυρη διεύθυνση e-mail';
+$messages['noemailwarning']    = '�������� �������� ��� ������ ��������� e-mail';
 
-$messages['nonamewarning']     = 'Παρακαλώ εισάγετε ένα όνομα';
+$messages['nonamewarning']     = '�������� �������� ��� �����';
 
-$messages['nopagesizewarning'] = 'Παρακαλώ εισάγετε ένα μέγεθος σελίδας';
+$messages['nopagesizewarning'] = '�������� �������� ��� ������� �������';
 
-$messages['formincomplete']    = 'Η φόρμα δεν συμπληρώθηκε τελείως';
+$messages['formincomplete']    = '� ����� ��� ������������ �������';
 
-$messages['norecipientwarning'] = 'Παρακαλώ εισάγετε τουλάχιστον έναν παραλήπτη';
+$messages['norecipientwarning'] = '�������� �������� ����������� ���� ���������';
 
-$messages['nosubjectwarning']  = 'Το πεδίο "Θέμα" είναι άδειο. Θέλετε να το πληκτρολογήσετε τώρα;';
+$messages['nosubjectwarning']  = '�� ����� "����" ����� �����. ������ �� �� ��������������� ����;';
 
-$messages['nobodywarning'] = 'Θέλετε να στείλετε αυτό το μήνυμα χωρίς κείμενο';
+$messages['nobodywarning'] = '������ �� �������� ���� �� ������ ����� �������';
 
-$messages['nocontactsfound'] = 'Δεν βρέθηκαν επαφές';
+$messages['nocontactsfound'] = '��� �������� ������';
 
-$messages['sendingfailed'] = 'Η αποστολή του μηνύματος απέτυχε';
+$messages['sendingfailed'] = '� �������� ��� ��������� �������';
 
-$messages['errorsaving'] = 'Εμφανίστηκε ένα σφάλμα κατά την αποθήκευση';
+$messages['errorsaving'] = '����������� ��� ������ ���� ��� ����������';
 
-$messages['errormoving']   = 'Το μήνυμα δεν μπόρεσε να μετακινηθεί';
+$messages['errormoving']   = '�� ������ ��� ������� �� �����������';
 
-$messages['errordeleting'] = 'Το μήνυμα δεν μπόρεσε να διαγραφτεί';
+$messages['errordeleting'] = '�� ������ ��� ������� �� ����������';
 
 
 ?>
\ No newline at end of file
diff --git a/program/localization/index.inc b/program/localization/index.inc
index d617bf11a..a0c6671c0 100644
--- a/program/localization/index.inc
+++ b/program/localization/index.inc
@@ -37,7 +37,7 @@
 	'el'    => 'Greek',
 	'hu'    => 'Hungarian',
 	'it'    => 'Italiano',
-	'jp'    => 'Japanese', 
+	'jp'    => 'Japanese',
 	'kr'    => 'Korean',
 	'lv'    => 'Latvian',
 	'nl'    => 'Nederlands',
diff --git a/program/localization/pt_BR/labels.inc b/program/localization/pt_BR/labels.inc
index 6945ff8f6..2b8943ba2 100644
--- a/program/localization/pt_BR/labels.inc
+++ b/program/localization/pt_BR/labels.inc
@@ -21,26 +21,32 @@
 
 $labels = array();
 
-// login page
-$labels['username']  = 'Nome de Usu�rio';
+// P�gina de login
+$labels['username']  = 'Usu�rio';
 $labels['password']  = 'Senha';
 $labels['server']    = 'Servidor';
 $labels['login']     = 'Login';
 
-// taskbar
+// Barra de tarefas
 $labels['logout']   = 'Sair';
-$labels['mail']     = 'E-Mail';
-$labels['settings'] = 'Configura��es pessoais';
+$labels['mail']     = 'E-mail';
+$labels['settings'] = 'Configura��es pessoais';
 $labels['addressbook'] = 'Cat�logo de endere�os';
 
-// mailbox names
+// Nome das pastas de correio
 $labels['inbox']  = 'Caixa de entrada';
+# Added by Cadu
+# start
+$labels['inbox']['drafts']='Rascunhos';
+$labels['inbox']['sent']='Enviados';
+$labels['inbox']['trash']='Lixeira';
+# end
 $labels['sent']   = 'Enviados';
 $labels['trash']  = 'Lixeira';
 $labels['drafts'] = 'Rascunhos';
 $labels['junk']   = 'Spam';
 
-// message listing
+// Listagem das mensagem
 $labels['subject'] = 'Assunto';
 $labels['from']    = 'De';
 $labels['to']      = 'Para';
@@ -50,14 +56,14 @@ $labels['replyto'] = 'Responder para';
 $labels['date']    = 'Data';
 $labels['size']    = 'Tamanho';
 $labels['priority'] = 'Prioridade';
-$labels['organization'] = 'Organiza��o';
+$labels['organization'] = 'Empresa';
 
-// aliases
+// R�tulos
 $labels['reply-to'] = $labels['replyto'];
 
 $labels['mailboxlist'] = 'Mensagens';
-$labels['messagesfromto'] = 'Mensagens $from at� $to de $count';
-$labels['messagenrof'] = 'Mensagens $nr de $count';
+$labels['messagesfromto'] = 'Mensagens $from - $to de $count';
+$labels['messagenrof'] = 'Mensagem $nr de $count';
 
 $labels['moveto']   = 'mover para ...';
 $labels['download'] = 'download';
@@ -71,7 +77,7 @@ $labels['prettydate'] = 'Formatar datas';
 
 $labels['addtoaddressbook'] = 'Incluir no cat�logo de endere�os';
 
-// weekdays short
+// Dias da semana abreviados
 $labels['sun'] = 'Dom';
 $labels['mon'] = 'Seg';
 $labels['tue'] = 'Ter';
@@ -80,21 +86,20 @@ $labels['thu'] = 'Qui';
 $labels['fri'] = 'Sex';
 $labels['sat'] = 'S�b';
 
-// weekdays long
+// Dias da semana completos
 $labels['sunday']    = 'Domingo';
-$labels['monday']    = 'Segunda';
-$labels['tuesday']   = 'Ter�a';
-$labels['wednesday'] = 'Quarta';
-$labels['thursday']  = 'Quinta';
-$labels['friday']    = 'Sexta';
+$labels['monday']    = 'Segunda-feira';
+$labels['tuesday']   = 'Ter�a-feira';
+$labels['wednesday'] = 'Quarta-feira';
+$labels['thursday']  = 'Quinta-feira';
+$labels['friday']    = 'Sexta-feira';
 $labels['saturday']  = 'S�bado';
 
 $labels['today'] = 'Hoje';
 
-// toolbar buttons
-$labels['writenewmessage']  = 'Criar nova mensagem';
+// Bot�es da barra de ferramentas
+$labels['writenewmessage']  = 'Escrever nova mensagem';
 $labels['replytomessage']   = 'Responder';
-$labels['replytoallmessage'] = 'Responder a todos';
 $labels['forwardmessage']   = 'Encaminhar';
 $labels['deletemessage']    = 'Mover para a lixeira';
 $labels['printmessage']     = 'Imprimir';
@@ -107,8 +112,8 @@ $labels['all'] = 'Todos';
 $labels['none'] = 'Nenhum';
 $labels['unread'] = 'N�o lido';
 
-// message compose
-$labels['compose']  = 'Compor nova mensagem';
+// Escrever mensagem
+$labels['compose']  = 'Escrever nova mensagem';
 $labels['sendmessage']  = 'Enviar mensagem agora';
 $labels['addattachment']  = 'Anexar arquivo';
 
@@ -117,7 +122,7 @@ $labels['upload'] = 'Enviar';
 $labels['close']  = 'Fechar';
 
 $labels['low']     = 'Baixa';
-$labels['lowest']  = 'Mais baixa';
+$labels['lowest']  = 'Muito baixa';
 $labels['normal']  = 'Normal';
 $labels['high']    = 'Alta';
 $labels['highest'] = 'Urgente';
@@ -125,7 +130,7 @@ $labels['highest'] = 'Urgente';
 $labels['showimages'] = 'Exibir imagens';
 
 
-// address boook
+// Cat�logo de endere�os
 $labels['name']      = 'Nome';
 $labels['firstname'] = 'Primeiro nome';
 $labels['surname']   = 'Sobrenome';
@@ -142,13 +147,13 @@ $labels['delete'] = 'Excluir';
 $labels['newcontact']     = 'Criar novo contato';
 $labels['deletecontact']  = 'Excluir contatos selecionados';
 $labels['composeto']      = 'Compor email para ';
-$labels['contactsfromto'] = 'Contatos $from at� $to de $count';
+$labels['contactsfromto'] = 'Contatos de $from at� $to de $count';
 
 
-// settings
+// Configura��es
 $labels['settingsfor']  = 'Configura��es para';
 
-$labels['preferences']  = 'Prefer�ncia';
+$labels['preferences']  = 'Prefer�ncias';
 $labels['userpreferences']  = 'Prefer�ncias do usu�rio';
 $labels['editpreferences']  = 'Editar prefer�ncias do usu�rio';
 
@@ -173,5 +178,4 @@ $labels['createfolder']  = 'Criar nova pasta';
 $labels['deletefolder']  = 'Excluir pasta';
 $labels['managefolders']  = 'Gerenciar pastas';
 
-
-?>
+?>
\ No newline at end of file
diff --git a/program/localization/pt_BR/messages.inc b/program/localization/pt_BR/messages.inc
index f96a0a862..ec34041d4 100644
--- a/program/localization/pt_BR/messages.inc
+++ b/program/localization/pt_BR/messages.inc
@@ -26,7 +26,7 @@ $messages['cookiesdisabled'] = 'Seu navegador n�o suporta cookies';
 
 $messages['sessionerror'] = 'A sess�o do seu navegador � inv�lida ou expirou';
 
-$messages['imaperror'] = 'Conex�o com o servidor IMAP falhou';
+$messages['imaperror'] = 'A conex�o com o servidor IMAP falhou';
 
 $messages['nomessagesfound'] = 'Nenhuma mensagem foi encontrada na caixa postal';
 
@@ -40,7 +40,7 @@ $messages['messagesent'] = 'Mensagem enviada';
 
 $messages['successfullysaved'] = 'Salvo com sucesso';
 
-$messages['addedsuccessfully'] = 'Contato incluido com sucesso';
+$messages['addedsuccessfully'] = 'Contato inclu�do com sucesso';
 
 $messages['contactexists'] = 'Um contato com esse e-mail j� existe';
 
@@ -50,9 +50,9 @@ $messages['encryptedmessage'] = 'Esta mensagem est� criptografada e n�o pode ser
 
 $messages['nocontactsfound'] = 'Nenhum contato foi encontrado.';
 
-$messages['sendingfailed'] = 'Falha no envia da mensagem';
+$messages['sendingfailed'] = 'Falha no envio da mensagem';
 
-$messages['errorsaving'] = 'Um erro ocorreu enquanto durante o salvamento da mensagem';
+$messages['errorsaving'] = 'Um erro ocorreu ao salvar a mensagem';
 
 
-?>
+?>
\ No newline at end of file
diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc
index 93fae66ef..9509b492b 100644
--- a/program/steps/mail/compose.inc
+++ b/program/steps/mail/compose.inc
@@ -583,6 +583,15 @@ function format_email_recipient($email, $name='')
   }
 
 
+function rcmail_charset_pulldown($selected='ISO-8859-1')
+  {
+  $select = new select();
+  
+  
+  return $select->show($selected);
+  }
+
+
 /****** get contacts for this user and add them to client scripts ********/
 
 $sql_result = $DB->query("SELECT name, email
diff --git a/program/steps/mail/sendmail.inc b/program/steps/mail/sendmail.inc
index c5505c948..4d7afb5ec 100644
--- a/program/steps/mail/sendmail.inc
+++ b/program/steps/mail/sendmail.inc
@@ -259,7 +259,7 @@ if ($CONFIG['smtp_log'])
                $mailto,
                $msg_subject);
 
-  if ($fp = fopen($INSTALL_PATH.'logs/sendmail', 'a'))
+  if ($fp = fopen($CONFIG['log_dir'].'/sendmail', 'a'))
     {
     fwrite($fp, $log_entry);
     fclose($fp);