Small bugfixes and improvements

7 files changed, 33 insertions, 7 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 7af2da942..aa259d51a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,13 @@
 CHANGELOG RoundCube Webmail
 ---------------------------
 
+2006/12/04 (thomasb)
+----------
+- Corrected date string in sent message header (closes #1484125)
+- Correclty choose "To" column in sent and draft mailboxes (closes #1483943)
+- Changed srong tooltips for message browse buttons (closes #1483930)
+
+
 2006/12/03 (estadtherr)
 ----------
 - Added fix to convert HTML signatures for plain text messages
diff --git a/program/localization/de_CH/labels.inc b/program/localization/de_CH/labels.inc
index 361d9ea56..e734b0a33 100644
--- a/program/localization/de_CH/labels.inc
+++ b/program/localization/de_CH/labels.inc
@@ -98,9 +98,16 @@ $labels['replytoallmessage'] = 'Antwort an Absender und alle Empfänger';
 $labels['forwardmessage']   = 'Nachricht weiterleiten';
 $labels['deletemessage']    = 'In den Papierkorb verschieben';
 $labels['printmessage']     = 'Diese Nachricht drucken';
+$labels['previousmessage']  = 'Vorherige Nachricht anzeigen';
 $labels['previousmessages'] = 'Vorherige Nachrichten anzeigen';
+$labels['firstmessage']     = 'Die erste Nachricht anzeigen';
+$labels['firstmessages']    = 'Die ersten Nachrichten anzeigen';
+$labels['nextmessage']      = 'Nächste Nachricht anzeigen';
 $labels['nextmessages']     = 'Weitere Nachrichten anzeigen';
+$labels['lastmessage']      = 'Die letzte Nachricht anzeigen';
+$labels['lastmessages']     = 'Die letzten Nachrichten anzeigen';
 $labels['backtolist']       = 'Zurück zur Liste';
+$labels['viewsource']       = 'Quelltext anzeigen';
 
 $labels['select'] = 'Auswählen';
 $labels['all']    = 'Alle';
diff --git a/program/localization/de_DE/labels.inc b/program/localization/de_DE/labels.inc
index ce19c98f1..87c8ce009 100644
--- a/program/localization/de_DE/labels.inc
+++ b/program/localization/de_DE/labels.inc
@@ -99,9 +99,17 @@ $labels['replytoallmessage'] = 'Antwort an Absender und alle Empfänger';
 $labels['forwardmessage']   = 'Nachricht weiterleiten';
 $labels['deletemessage']    = 'In den Papierkorb verschieben';
 $labels['printmessage']     = 'Diese Nachricht drucken';
+$labels['previousmessage']  = 'Vorherige Nachricht anzeigen';
 $labels['previousmessages'] = 'Vorherige Nachrichten anzeigen';
+$labels['firstmessage']     = 'Die erste Nachricht anzeigen';
+$labels['firstmessages']    = 'Die ersten Nachrichten anzeigen';
+$labels['nextmessage']      = 'Nächste Nachricht anzeigen';
 $labels['nextmessages']     = 'Weitere Nachrichten anzeigen';
+$labels['lastmessage']      = 'Die letzte Nachricht anzeigen';
+$labels['lastmessages']     = 'Die letzten Nachrichten anzeigen';
 $labels['backtolist']       = 'Zurück zur Liste';
+$labels['viewsource']       = 'Quelltext anzeigen';
+
 
 $labels['select'] = 'Auswählen';
 $labels['all']    = 'Alle';
diff --git a/program/localization/en_US/labels.inc b/program/localization/en_US/labels.inc
index 542cca95d..ae5243ba5 100644
--- a/program/localization/en_US/labels.inc
+++ b/program/localization/en_US/labels.inc
@@ -97,9 +97,13 @@ $labels['replytoallmessage'] = 'Reply to sender and all recipients';
 $labels['forwardmessage']   = 'Forward the message';
 $labels['deletemessage']    = 'Move message to trash';
 $labels['printmessage']     = 'Print this message';
+$labels['previousmessage']  = 'Show the previous message';
 $labels['previousmessages'] = 'Show previous set of messages';
+$labels['firstmessage']     = 'Show the first message';
 $labels['firstmessages']    = 'Show first set of messages';
+$labels['nextmessage']      = 'Show the next message';
 $labels['nextmessages']     = 'Show next set of messages';
+$labels['lastmessage']      = 'Show the last messages';
 $labels['lastmessages']     = 'Show last set of messages';
 $labels['backtolist']       = 'Back to message list';
 $labels['viewsource']       = 'Show source';
diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc
index d655a3316..9bda8906d 100644
--- a/program/steps/mail/func.inc
+++ b/program/steps/mail/func.inc
@@ -513,8 +513,8 @@ function rcmail_js_message_list($a_headers, $insert_top=FALSE)
   $a_show_cols = is_array($CONFIG['list_cols']) ? $CONFIG['list_cols'] : array('subject');
 
   // show 'to' instead of from in sent messages
-  if (strtolower($IMAP->get_mailbox_name())=='sent' && ($f = array_search('from', $a_show_cols))
-      && !array_search('to', $a_show_cols))
+  if (($IMAP->get_mailbox_name()==$CONFIG['sent_mbox'] || $IMAP->get_mailbox_name()==$CONFIG['drafts_mbox'])
+      && ($f = array_search('from', $a_show_cols)) && !array_search('to', $a_show_cols))
     $a_show_cols[$f] = 'to';
 
   $commands .= sprintf("this.set_message_coltypes(%s);\n", array2js($a_show_cols)); 
diff --git a/program/steps/mail/sendmail.inc b/program/steps/mail/sendmail.inc
index c3e0170fe..41735881c 100644
--- a/program/steps/mail/sendmail.inc
+++ b/program/steps/mail/sendmail.inc
@@ -166,7 +166,7 @@ if (empty($identity_arr['string']))
   $identity_arr['string'] = $from;
 
 // compose headers array
-$headers = array('Date' => date('D, j M Y G:i:s O'),
+$headers = array('Date' => date('D, j M Y H:i:s O'),
                  'From' => $identity_arr['string'],
                  'To'   => rcube_charset_convert($mailto, $input_charset, $message_charset));
 
diff --git a/skins/default/templates/message.html b/skins/default/templates/message.html
index 2ce804685..9efed60bd 100644
--- a/skins/default/templates/message.html
+++ b/skins/default/templates/message.html
@@ -11,11 +11,11 @@
 <roundcube:include file="/includes/header.html" />
 
 <div id="messagecountbar">
-<roundcube:button command="firstmessage" imageSel="/images/buttons/first_sel.png" imageAct="/images/buttons/first_act.png" imagePas="/images/buttons/first_pas.png" width="11" height="11" title="firstmessages" />
-<roundcube:button command="previousmessage" imageSel="/images/buttons/previous_sel.png" imageAct="/images/buttons/previous_act.png" imagePas="/images/buttons/previous_pas.png" width="11" height="11" title="previousmessages" />
+<roundcube:button command="firstmessage" imageSel="/images/buttons/first_sel.png" imageAct="/images/buttons/first_act.png" imagePas="/images/buttons/first_pas.png" width="11" height="11" title="firstmessage" />
+<roundcube:button command="previousmessage" imageSel="/images/buttons/previous_sel.png" imageAct="/images/buttons/previous_act.png" imagePas="/images/buttons/previous_pas.png" width="11" height="11" title="previousmessage" />
 &nbsp;<roundcube:object name="messageCountDisplay" />&nbsp;
-<roundcube:button command="nextmessage" imageSel="/images/buttons/next_sel.png" imageAct="/images/buttons/next_act.png" imagePas="/images/buttons/next_pas.png" width="11" height="11" title="nextmessages" />
-<roundcube:button command="lastmessage" imageSel="/images/buttons/last_sel.png" imageAct="/images/buttons/last_act.png" imagePas="/images/buttons/last_pas.png" width="11" height="11" title="lastmessages" />
+<roundcube:button command="nextmessage" imageSel="/images/buttons/next_sel.png" imageAct="/images/buttons/next_act.png" imagePas="/images/buttons/next_pas.png" width="11" height="11" title="nextmessage" />
+<roundcube:button command="lastmessage" imageSel="/images/buttons/last_sel.png" imageAct="/images/buttons/last_act.png" imagePas="/images/buttons/last_pas.png" width="11" height="11" title="lastmessage" />
 </div>
 
 <div id="messagetoolbar">