Resolved a feature request:

unique display of date-time of a mail
maillist now sorted for mail-date as default, user can switch sort order
to all other items (subject, author, size)

10 files changed, 81 insertions, 46 deletions

diff --git a/noncore/net/mail/libmailwrapper/genericwrapper.cpp b/noncore/net/mail/libmailwrapper/genericwrapper.cpp
index 703235d..0ac842d 100644
--- a/noncore/net/mail/libmailwrapper/genericwrapper.cpp
+++ b/noncore/net/mail/libmailwrapper/genericwrapper.cpp
@@ -371,33 +371,33 @@ QStringList Genericwrapper::parseInreplies(mailimf_in_reply_to * in_replies)
         QString h((char*)current->data);
         while (h.length()>0 && h[0]=='<') {
             h.remove(0,1);
         }
         while (h.length()>0 && h[h.length()-1]=='>') {
             h.remove(h.length()-1,1);
         }
         if (h.length()>0) {
             res.append(h);
         }
     }
     return res;
 }
 
 void Genericwrapper::parseList(QValueList<Opie::Core::OSmartPointer<RecMail> > &target,mailsession*session,const QString&mailbox,bool mbox_as_to)
 {
-    int r;
+    int r,toffset;
     mailmessage_list * env_list = 0;
     r = mailsession_get_messages_list(session,&env_list);
     if (r != MAIL_NO_ERROR) {
         odebug << "Error message list" << oendl;
         return;
     }
     r = mailsession_get_envelopes_list(session, env_list);
     if (r != MAIL_NO_ERROR) {
         odebug << "Error filling message list" << oendl;
         if (env_list) {
             mailmessage_list_free(env_list);
         }
         return;
     }
     mailimf_references * refs = 0;
     mailimf_in_reply_to * in_replies = 0;
@@ -424,39 +424,39 @@ void Genericwrapper::parseList(QValueList<Opie::Core::OSmartPointer<RecMail> > &
         mail->setMbox(mailbox);
         mail->setNumber(msg->msg_index);
         if (single_fields.fld_subject)
             mail->setSubject( convert_String(single_fields.fld_subject->sbj_value));
         if (single_fields.fld_from)
             mail->setFrom(parseMailboxList(single_fields.fld_from->frm_mb_list));
         if (!mbox_as_to) {
             if (single_fields.fld_to)
                 mail->setTo( parseAddressList( single_fields.fld_to->to_addr_list ) );
         } else {
             mail->setTo(mailbox);
         }
         if (single_fields.fld_cc)
             mail->setCC( parseAddressList( single_fields.fld_cc->cc_addr_list ) );
         if (single_fields.fld_bcc)
             mail->setBcc( parseAddressList( single_fields.fld_bcc->bcc_addr_list ) );
-        if (single_fields.fld_orig_date)
-            mail->setDate( parseDateTime( single_fields.fld_orig_date->dt_date_time ) );
-        // crashes when accessing pop3 account?
+        if (single_fields.fld_orig_date) {
+            QDateTime d = parseDateTime( single_fields.fld_orig_date->dt_date_time,toffset);
+            mail->setDate( d,toffset );
+        }
         if (single_fields.fld_message_id && single_fields.fld_message_id->mid_value) {
             mail->setMsgid(QString(single_fields.fld_message_id->mid_value));
         }
-
         if (single_fields.fld_reply_to) {
             QStringList t = parseAddressList(single_fields.fld_reply_to->rt_addr_list);
             if (t.count()>0) {
                 mail->setReplyto(t[0]);
             }
         }
 #if 0
         refs = single_fields.fld_references;
         if (refs && refs->mid_list && clist_count(refs->mid_list)) {
             char * text = (char*)refs->mid_list->first->data;
             mail->setReplyto(QString(text));
         }
 #endif
         if (single_fields.fld_in_reply_to && single_fields.fld_in_reply_to->mid_list &&
                 clist_count(single_fields.fld_in_reply_to->mid_list)) {
             mail->setInreply(parseInreplies(single_fields.fld_in_reply_to));
diff --git a/noncore/net/mail/libmailwrapper/imapwrapper.cpp b/noncore/net/mail/libmailwrapper/imapwrapper.cpp
index 56efa0b..8e5212b 100644
--- a/noncore/net/mail/libmailwrapper/imapwrapper.cpp
+++ b/noncore/net/mail/libmailwrapper/imapwrapper.cpp
@@ -359,33 +359,33 @@ QValueList<Opie::Core::OSmartPointer<Folder> >* IMAPwrapper::listFolders()
             folders->append(new IMAPFolder(temp,del,selectable,no_inferiors,account->getPrefix()));
         }
     } else {
         odebug << "error fetching folders " << m_imap->imap_response << "" << oendl;
     }
     if (result) mailimap_list_result_free( result );
     return folders;
 }
 
 RecMail*IMAPwrapper::parse_list_result(mailimap_msg_att* m_att)
 {
     RecMail * m = 0;
     mailimap_msg_att_item *item=0;
     clistcell *current,*c,*cf;
     mailimap_msg_att_dynamic*flist;
     mailimap_flag_fetch*cflag;
-    int size;
+    int size,toffset;
     QBitArray mFlags(7);
     QStringList addresslist;
 
     if (!m_att) {
         return m;
     }
     size = 0;
     m = new RecMail();
     for (c = clist_begin(m_att->att_list); c!=NULL;c=clist_next(c) ) {
         current = c;
         item = (mailimap_msg_att_item*)current->data;
         if (item->att_type!=MAILIMAP_MSG_ATT_ITEM_STATIC) {
             flist = (mailimap_msg_att_dynamic*)item->att_data.att_dyn;
             if (!flist->att_list) {
                 continue;
             }
@@ -411,33 +411,34 @@ RecMail*IMAPwrapper::parse_list_result(mailimap_msg_att* m_att)
                         break;
                     case MAILIMAP_FLAG_KEYWORD:   /* keyword flag */
                         break;
                     case MAILIMAP_FLAG_EXTENSION: /* \extension flag */
                         break;
                     default:
                         break;
                     }
                 } else if (cflag->fl_type==MAILIMAP_FLAG_FETCH_RECENT) {
                     mFlags.setBit(FLAG_RECENT);
                 }
             }
             continue;
         }
         if (item->att_data.att_static->att_type==MAILIMAP_MSG_ATT_ENVELOPE) {
             mailimap_envelope * head = item->att_data.att_static->att_data.att_env;
-            m->setDate(parseDateTime(head->env_date));
+            QDateTime d = parseDateTime(head->env_date,toffset);
+            m->setDate(d,toffset);
             m->setSubject(convert_String((const char*)head->env_subject));
             if (head->env_from!=NULL) {
                 addresslist = address_list_to_stringlist(head->env_from->frm_list);
                 if (addresslist.count()) {
                     m->setFrom(addresslist.first());
                 }
             }
             if (head->env_to!=NULL) {
                 addresslist = address_list_to_stringlist(head->env_to->to_list);
                 m->setTo(addresslist);
             }
             if (head->env_cc!=NULL) {
                 addresslist = address_list_to_stringlist(head->env_cc->cc_list);
                 m->setCC(addresslist);
             }
             if (head->env_bcc!=NULL) {
diff --git a/noncore/net/mail/libmailwrapper/mailstatics.cpp b/noncore/net/mail/libmailwrapper/mailstatics.cpp
index 4878dc9..033ec28 100644
--- a/noncore/net/mail/libmailwrapper/mailstatics.cpp
+++ b/noncore/net/mail/libmailwrapper/mailstatics.cpp
@@ -1,29 +1,30 @@
 #include "mailstatics.h"
 #include <libetpan/libetpan.h>
-#include <qpe/timestring.h>
+//#include <qpe/timestring.h>
 
-QString MailStatics::parseDateTime(const mailimf_date_time *date )
+QDateTime MailStatics::parseDateTime(const mailimf_date_time *date,int&offset )
 {
-    if (!date) return "";
+    offset = 0;
+    if (!date) {
+        return QDateTime();
+    }
     QDateTime da(QDate(date->dt_year,date->dt_month,date->dt_day),QTime(date->dt_hour,date->dt_min,date->dt_sec));
-    QString timestring = TimeString::numberDateString(QDate(date->dt_year,date->dt_month,date->dt_day))+" ";
-    timestring+=TimeString::timeString(QTime(date->dt_hour,date->dt_min,date->dt_sec))+" ";
-    timestring.sprintf(timestring+" %+05i",date->dt_zone);
-    return timestring;
+    offset = date->dt_zone;
+    return da;
 }
 
-QString MailStatics::parseDateTime(const char*date)
+QDateTime MailStatics::parseDateTime(const char*date,int&offset)
 {
-    mailimf_date_time * date_time;
-    QString d = "";
+    mailimf_date_time * date_time=0;
+    QDateTime d;
     size_t cur_tok = 0;
     if (!date) return d;
     int r = mailimf_date_time_parse(date,strlen(date),&cur_tok,&date_time);
     if (r==MAILIMF_NO_ERROR) {
-        d = parseDateTime(date_time);
+        d = parseDateTime(date_time,offset);
     }
     if (date_time) {
         mailimf_date_time_free(date_time);
     }
     return d;
-}
\ No newline at end of file
+}
diff --git a/noncore/net/mail/libmailwrapper/mailstatics.h b/noncore/net/mail/libmailwrapper/mailstatics.h
index 841d14d..c714ead 100644
--- a/noncore/net/mail/libmailwrapper/mailstatics.h
+++ b/noncore/net/mail/libmailwrapper/mailstatics.h
@@ -1,19 +1,19 @@
 #ifndef __MAIL_STATICS_H
 #define __MAIL_STATICS_H
 
 #include <qdatetime.h>
 #include <qstring.h>
 
 struct mailimf_date_time;
 
 class MailStatics
 {
 protected:
-    static QString parseDateTime(const mailimf_date_time * date);
-    static QString parseDateTime(const char*date);
+    static QDateTime parseDateTime(const mailimf_date_time * date,int&offset);
+    static QDateTime parseDateTime(const char*date,int&offset);
     MailStatics(){};
     virtual ~MailStatics(){};
 public:
 };
 
 #endif
diff --git a/noncore/net/mail/libmailwrapper/mailtypes.cpp b/noncore/net/mail/libmailwrapper/mailtypes.cpp
index d4395a2..b009b75 100644
--- a/noncore/net/mail/libmailwrapper/mailtypes.cpp
+++ b/noncore/net/mail/libmailwrapper/mailtypes.cpp
@@ -1,71 +1,84 @@
 #include "mailtypes.h"
 
 #include <opie2/odebug.h>
+#include <qpe/timestring.h>
 
 #include <stdlib.h>
 
 using namespace Opie::Core;
 RecMail::RecMail()
-    :Opie::Core::ORefCount(),subject(""),date(""),from(""),mbox(""),msg_id(""),msg_number(0),msg_size(0),msg_flags(7)
+    :Opie::Core::ORefCount(),subject(""),from(""),mbox(""),msg_id(""),msg_number(0),msg_size(0),msg_flags(7),maildate(),date("")
 {
     init();
 }
 
 RecMail::RecMail(const RecMail&old)
-    :Opie::Core::ORefCount(),subject(""),date(""),from(""),mbox(""),msg_id(""),msg_number(0),msg_flags(7)
+    :Opie::Core::ORefCount(),subject(""),from(""),mbox(""),msg_id(""),msg_number(0),msg_flags(7),maildate(),date("")
 {
     init();
     copy_old(old);
-    odebug << "Copy constructor RecMail" << oendl; 
+    odebug << "Copy constructor RecMail" << oendl;
 }
 
 RecMail::~RecMail()
 {
     wrapper = 0;
 }
 
 void RecMail::copy_old(const RecMail&old)
 {
     subject = old.subject;
+    maildate = old.maildate;
     date = old.date;
     mbox = old.mbox;
     msg_id = old.msg_id;
     msg_size = old.msg_size;
     msg_number = old.msg_number;
     from = old.from;
     msg_flags = old.msg_flags;
     to = old.to;
     cc = old.cc;
     bcc = old.bcc;
     wrapper = old.wrapper;
     in_reply_to = old.in_reply_to;
     references = old.references;
     replyto = old.replyto;
 }
 
 void RecMail::init()
 {
     to.clear();
     cc.clear();
     bcc.clear();
     in_reply_to.clear();
     references.clear();
     wrapper = 0;
 }
 
+void RecMail::setDate( const QDateTime&a,int offset)
+{
+    QString timestring = TimeString::numberDateString(a.date())+" ";
+    timestring+=TimeString::timeString(a.time());
+    if (offset > 0) {
+        timestring.sprintf(timestring+" %+05i",offset);
+    }
+    date = timestring;
+    maildate = a;
+}
+
 void RecMail::setWrapper(AbstractMail*awrapper)
 {
     wrapper = awrapper;
 }
 
 AbstractMail* RecMail::Wrapper()
 {
     return wrapper;
 }
 
 void RecMail::setTo(const QStringList&list)
 {
     to = list;
 }
 
 const QStringList&RecMail::To()const
@@ -121,33 +134,33 @@ RecPart::RecPart()
     m_poslist.clear();
 }
 
 RecPart::RecPart(const RecPart&old)
     : Opie::Core::ORefCount(),
     m_type(""),m_subtype(""),m_identifier(""),m_encoding(""),m_description(""),m_lines(0),m_size(0)
 {
     m_type = old.m_type;
     m_subtype = old.m_subtype;
     m_identifier = old.m_identifier;
     m_encoding = old.m_encoding;
     m_description = old.m_description;
     m_lines = old.m_lines;
     m_size = old.m_size;
     m_Parameters = old.m_Parameters;
     m_poslist = old.m_poslist;
-    odebug << "RecPart copy constructor" << oendl; 
+    odebug << "RecPart copy constructor" << oendl;
 }
 
 RecPart::~RecPart()
 {
 }
 
 void RecPart::setSize(unsigned int size)
 {
     m_size = size;
 }
 
 const unsigned int RecPart::Size()const
 {
     return m_size;
 }
 
@@ -245,33 +258,33 @@ const QValueList<int>& RecPart::Positionlist()const
 {
     return m_poslist;
 }
 
 RecBody::RecBody()
     : Opie::Core::ORefCount(),m_BodyText(),m_description(new RecPart())
 {
     m_PartsList.clear();
 }
 
 RecBody::RecBody(const RecBody&old)
     :Opie::Core::ORefCount(),m_BodyText(),m_PartsList(),m_description(new RecPart())
 {
     m_BodyText = old.m_BodyText;
     m_PartsList = old.m_PartsList;
     m_description = old.m_description;
-    odebug << "Recbody copy constructor" << oendl; 
+    odebug << "Recbody copy constructor" << oendl;
 }
 
 RecBody::~RecBody()
 {
 }
 
 void RecBody::setBodytext(const QString&bodyText)
 {
     m_BodyText = bodyText;
 }
 
 const QString& RecBody::Bodytext()const
 {
     return m_BodyText;
 }
 
@@ -310,40 +323,40 @@ encodedString::encodedString()
 encodedString::encodedString(const char*nContent,unsigned int nSize)
 {
     init();
     setContent(nContent,nSize);
 }
 
 encodedString::encodedString(char*nContent,unsigned int nSize)
 {
     init();
     setContent(nContent,nSize);
 }
 
 encodedString::encodedString(const encodedString&old)
 {
     init();
     copy_old(old);
-    odebug << "encodedeString: copy constructor!" << oendl; 
+    odebug << "encodedeString: copy constructor!" << oendl;
 }
 
 encodedString& encodedString::operator=(const encodedString&old)
 {
     init();
     copy_old(old);
-    odebug << "encodedString: assign operator!" << oendl; 
+    odebug << "encodedString: assign operator!" << oendl;
     return *this;
 }
 
 encodedString::~encodedString()
 {
     clean();
 }
 
 void encodedString::init()
 {
     content = 0;
     size = 0;
 }
 
 void encodedString::clean()
 {
@@ -383,17 +396,16 @@ void encodedString::setContent(const char*nContent,int nSize)
     }
 }
 
 void encodedString::setContent(char*nContent,int nSize)
 {
     content = nContent;
     size = nSize;
 }
 
 folderStat&folderStat::operator=(const folderStat&old)
 {
     message_count = old.message_count;
     message_unseen = old.message_unseen;
     message_recent = old.message_recent;
     return *this;
 }
-
diff --git a/noncore/net/mail/libmailwrapper/mailtypes.h b/noncore/net/mail/libmailwrapper/mailtypes.h
index c317880..272514c 100644
--- a/noncore/net/mail/libmailwrapper/mailtypes.h
+++ b/noncore/net/mail/libmailwrapper/mailtypes.h
@@ -2,96 +2,101 @@
 #define __MAIL_TYPES_H
 
 #define FLAG_ANSWERED 0
 #define FLAG_FLAGGED  1
 #define FLAG_DELETED  2
 #define FLAG_SEEN     3
 #define FLAG_DRAFT    4
 #define FLAG_RECENT   5
 
 #include <opie2/osmartpointer.h>
 
 #include <qbitarray.h>
 #include <qstring.h>
 #include <qstringlist.h>
 #include <qmap.h>
 #include <qvaluelist.h>
+#include <qdatetime.h>
 
 class AbstractMail;
 /* a class to describe mails in a mailbox */
 /* Attention!
    From programmers point of view it would make sense to
    store the mail body into this class, too.
    But: not from the point of view of the device.
    Mailbodies can be real large. So we request them when
    needed from the mail-wrapper class direct from the server itself
    (imap) or from a file-based cache (pop3?)
    So there is no interface "const QString&body()" but you should
    make a request to the mailwrapper with this class as parameter to
    get the body. Same words for the attachments.
 */
 class RecMail:public Opie::Core::ORefCount
 {
 public:
     RecMail();
     RecMail(const RecMail&old);
     virtual ~RecMail();
 
     const unsigned int getNumber()const{return msg_number;}
     void setNumber(unsigned int number){msg_number=number;}
-    const QString&getDate()const{ return date; }
-    void setDate( const QString&a ) { date = a; }
     const QString&getFrom()const{ return from; }
     void setFrom( const QString&a ) { from = a; }
     const QString&getSubject()const { return subject; }
     void setSubject( const QString&s ) { subject = s; }
     const QString&getMbox()const{return mbox;}
     void setMbox(const QString&box){mbox = box;}
     void setMsgid(const QString&id){msg_id=id;}
     const QString&Msgid()const{return msg_id;}
     void setReplyto(const QString&reply){replyto=reply;}
     const QString&Replyto()const{return replyto;}
     void setMsgsize(unsigned int size){msg_size = size;}
     const unsigned int Msgsize()const{return msg_size;}
 
 
     void setTo(const QStringList&list);
     const QStringList&To()const;
     void setCC(const QStringList&list);
     const QStringList&CC()const;
     void setBcc(const QStringList&list);
     const QStringList&Bcc()const;
     void setInreply(const QStringList&list);
     const QStringList&Inreply()const;
     void setReferences(const QStringList&list);
     const QStringList&References()const;
 
     const QBitArray&getFlags()const{return msg_flags;}
     void setFlags(const QBitArray&flags){msg_flags = flags;}
 
     void setWrapper(AbstractMail*wrapper);
     AbstractMail* Wrapper();
 
+    const QDateTime&getDate()const{ return maildate; }
+    const QString&getStringDate()const{return date;}
+    void setDate( const QDateTime&a,int offset=0 );
+
 protected:
-    QString subject,date,from,mbox,msg_id,replyto;
+    QString subject,from,mbox,msg_id,replyto;
     unsigned int msg_number,msg_size;
     QBitArray msg_flags;
     QStringList to,cc,bcc,in_reply_to,references;
     AbstractMail*wrapper;
     void init();
     void copy_old(const RecMail&old);
+    QDateTime maildate;
+    QString date;
 };
 
 typedef Opie::Core::OSmartPointer<RecMail> RecMailP;
 typedef QMap<QString,QString> part_plist_t;
 
 class RecPart:public Opie::Core::ORefCount
 {
 protected:
     QString m_type,m_subtype,m_identifier,m_encoding,m_description;
     unsigned int m_lines,m_size;
     part_plist_t m_Parameters;
     /* describes the position in the mail */
     QValueList<int> m_poslist;
 
 public:
     RecPart();
diff --git a/noncore/net/mail/mailistviewitem.cpp b/noncore/net/mail/mailistviewitem.cpp
index 0b926da..d3a0723 100644
--- a/noncore/net/mail/mailistviewitem.cpp
+++ b/noncore/net/mail/mailistviewitem.cpp
@@ -1,32 +1,33 @@
 #include "mailistviewitem.h"
 #include <libmailwrapper/abstractmail.h>
 #include <qtextstream.h>
 #include <qpe/resource.h>
+#include <qpe/timestring.h>
 
 MailListViewItem::MailListViewItem(QListView * parent, MailListViewItem * item )
         :QListViewItem(parent,item),mail_data()
 {
 }
 
 void MailListViewItem::showEntry()
 {
     if ( mail_data->getFlags().testBit( FLAG_ANSWERED ) == true) {
         setPixmap( 0, Resource::loadPixmap( "mail/kmmsgreplied") );
     } else if ( mail_data->getFlags().testBit( FLAG_SEEN ) == true )  {
-        /* I think it looks nicer if there are not such a log of icons but only on mails
+        /* I think it looks nicer if there are not such a lot of icons but only on mails
            replied or new - Alwin*/
         //setPixmap( 0, Resource::loadPixmap( "mail/kmmsgunseen") );
     } else  {
         setPixmap( 0, Resource::loadPixmap( "mail/kmmsgnew") );
     }
     double s = mail_data->Msgsize();
     int w;
     w=0;
 
     while (s>1024) {
         s/=1024;
         ++w;
         if (w>=2) break;
     }
 
     QString q="";
@@ -35,37 +36,50 @@ void MailListViewItem::showEntry()
     case 1:
         q="k";
         break;
     case 2:
         q="M";
         break;
     default:
         break;
     }
 
     {
         QTextOStream o(&fsize);
         if (w>0) o.precision(2); else o.precision(0);
         o.setf(QTextStream::fixed);
         o << s << " " << q << "Byte";
     }
-
     setText(1,mail_data->getSubject());
     setText(2,mail_data->getFrom());
     setText(3,fsize);
-    setText(4,mail_data->getDate());
+    setText(4,mail_data->getStringDate());
+}
+
+QString MailListViewItem::key(int col,bool) const
+{
+    QString temp;
+    if (col == 4) {
+        temp.sprintf( "%08d",QDateTime().secsTo(mail_data->getDate()));
+        return temp;
+    }
+    if (col == 3) {
+        temp.sprintf( "%020d",mail_data->Msgsize());
+        return temp;
+    }
+    return text(col);
 }
 
 void MailListViewItem::storeData(const RecMailP&data)
 {
     mail_data = data;
 }
 
 const RecMailP& MailListViewItem::data()const
 {
     return mail_data;
 }
 
 MAILLIB::ATYPE MailListViewItem::wrapperType()
 {
     if (!mail_data->Wrapper()) return MAILLIB::A_UNDEFINED;
     return mail_data->Wrapper()->getType();
diff --git a/noncore/net/mail/mailistviewitem.h b/noncore/net/mail/mailistviewitem.h
index d953d83..ce64ca9 100644
--- a/noncore/net/mail/mailistviewitem.h
+++ b/noncore/net/mail/mailistviewitem.h
@@ -3,21 +3,22 @@
 
 #include <qlistview.h>
 #include <libmailwrapper/mailtypes.h>
 #include <libmailwrapper/maildefines.h>
 
 class MailListViewItem:public QListViewItem
 {
 public:
     MailListViewItem(QListView * parent, MailListViewItem * after );
     virtual ~MailListViewItem(){}
 
     void storeData(const RecMailP&data);
     const RecMailP&data()const;
     void showEntry();
     MAILLIB::ATYPE wrapperType();
 
+    virtual QString key(int col,bool) const;
 protected:
     RecMailP mail_data;
 };
 
 #endif
diff --git a/noncore/net/mail/mainwindow.cpp b/noncore/net/mail/mainwindow.cpp
index 6252fc2..c115b32 100644
--- a/noncore/net/mail/mainwindow.cpp
+++ b/noncore/net/mail/mainwindow.cpp
@@ -90,33 +90,34 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags )
     layout = new QBoxLayout ( view, QBoxLayout::LeftToRight );
 
     folderView = new AccountView( view );
     folderView->header()->hide();
     folderView->setRootIsDecorated( true );
     folderView->addColumn( tr( "Mailbox" ) );
 
     layout->addWidget( folderView );
 
     mailView = new QListView( view );
     mailView->addColumn( "" );
     mailView->addColumn( tr( "Subject" ),QListView::Manual );
     mailView->addColumn( tr( "Sender" ),QListView::Manual );
     mailView->addColumn( tr( "Size" ),QListView::Manual);
     mailView->addColumn( tr( "Date" ));
     mailView->setAllColumnsShowFocus(true);
-    mailView->setSorting(-1);
+    mailView->setShowSortIndicator(true);
+    mailView->setSorting(4,false);
 
     statusWidget = new StatusWidget( wrapperBox );
     statusWidget->hide();
 
     layout->addWidget( mailView );
     layout->setStretchFactor( folderView, 1 );
     layout->setStretchFactor( mailView, 2 );
 
     slotAdjustLayout();
 
     QPEApplication::setStylusOperation( mailView->viewport(),QPEApplication::RightOnHold);
     QPEApplication::setStylusOperation( folderView->viewport(),QPEApplication::RightOnHold);
 
     connect( mailView, SIGNAL( mouseButtonClicked(int,QListViewItem*,const QPoint&,int) ),this,
              SLOT( mailLeftClicked(int,QListViewItem*,const QPoint&,int) ) );
     connect( mailView, SIGNAL( mouseButtonPressed(int,QListViewItem*,const QPoint&,int) ),this,
@@ -130,33 +131,33 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags )
     // Added by Stefan Eilers to allow starting by addressbook..
     // copied from old mail2
 #if !defined(QT_NO_COP)
     connect( qApp, SIGNAL( appMessage(const QCString&,const QByteArray&) ),
              this, SLOT( appMessage(const QCString&,const QByteArray&) ) );
 #endif
 
     QTimer::singleShot( 1000, this, SLOT( slotAdjustColumns() ) );
 }
 
 MainWindow::~MainWindow()
 {
 }
 
 void MainWindow::appMessage(const QCString &, const QByteArray &)
 {
-    odebug << "appMessage not reached" << oendl; 
+    odebug << "appMessage not reached" << oendl;
 }
 
 void MainWindow::slotAdjustLayout() {
 
   QWidget *d = QApplication::desktop();
 
   if ( d->width() < d->height() ) {
     layout->setDirection( QBoxLayout::TopToBottom );
     } else {
     layout->setDirection( QBoxLayout::LeftToRight );
   }
 }
 
 void MainWindow::slotAdjustColumns()
 {
     bool hidden = folderView->isHidden();
@@ -164,55 +165,55 @@ void MainWindow::slotAdjustColumns()
     folderView->setColumnWidth( 0, folderView->visibleWidth() );
     if ( hidden ) folderView->hide();
 
     mailView->setColumnWidth( 0, 10 );
     mailView->setColumnWidth( 1, mailView->visibleWidth() - 130 );
     mailView->setColumnWidth( 2, 80 );
     mailView->setColumnWidth( 3, 50 );
     mailView->setColumnWidth( 4, 50 );
 }
 
 void MainWindow::slotEditSettings()
 {
 }
 
 void MainWindow::slotShowFolders( bool )
 {
-   odebug << "slotShowFolders not reached" << oendl; 
+   odebug << "slotShowFolders not reached" << oendl;
 }
 
 void MainWindow::refreshMailView(const QValueList<RecMailP>&)
 {
-   odebug << "refreshMailView not reached" << oendl; 
+   odebug << "refreshMailView not reached" << oendl;
 }
 
 void MainWindow::mailLeftClicked(int, QListViewItem *,const QPoint&,int )
 {
-    odebug << "mailLeftClicked not reached" << oendl; 
+    odebug << "mailLeftClicked not reached" << oendl;
 }
 
 void MainWindow::displayMail()
 {
-    odebug << "displayMail not reached" << oendl; 
+    odebug << "displayMail not reached" << oendl;
 }
 
 void MainWindow::slotDeleteMail()
 {
-    odebug << "deleteMail not reached" << oendl; 
+    odebug << "deleteMail not reached" << oendl;
 }
 
 void MainWindow::mailHold(int, QListViewItem *,const QPoint&,int  )
 {
-    odebug << "mailHold not reached" << oendl; 
+    odebug << "mailHold not reached" << oendl;
 }
 
 void MainWindow::slotSendQueued()
 {
 }
 
 void MainWindow::slotEditAccounts()
 {
 }
 
 void MainWindow::slotComposeMail()
 {
 }
diff --git a/noncore/net/mail/viewmail.cpp b/noncore/net/mail/viewmail.cpp
index ce694d5..d5f9b7f 100644
--- a/noncore/net/mail/viewmail.cpp
+++ b/noncore/net/mail/viewmail.cpp
@@ -131,33 +131,33 @@ void ViewMail::setBody(const RecBodyP&body )
         QTextOStream o(&fsize);
         if (w>0) o.precision(2); else o.precision(0);
         o.setf(QTextStream::fixed);
         o << s << " " << q << "Byte";
     }
 
     curItem=new AttachItem(attachments,curItem,type,"Mailbody","",fsize,-1,body->Description()->Positionlist());
     QString filename = "";
 
     for (unsigned int i = 0; i < body->Parts().count();++i)
     {
         filename = "";
         type = body->Parts()[i]->Type()+"/"+body->Parts()[i]->Subtype();
         part_plist_t::ConstIterator it = body->Parts()[i]->Parameters().begin();
         for (;it!=body->Parts()[i]->Parameters().end();++it)
         {
-            odebug << it.key() << oendl; 
+            odebug << it.key() << oendl;
             if (it.key().lower()=="name")
             {
                 filename=it.data();
             }
         }
         s = body->Parts()[i]->Size();
         w = 0;
         while (s>1024)
         {
             s/=1024;
             ++w;
             if (w>=2) break;
         }
         switch(w)
         {
         case 1:
@@ -234,33 +234,33 @@ void ViewMail::slotItemClicked( QListViewItem * item , const QPoint & point, int
 
             if( !str.isEmpty() )
             {
                 encodedString*content = m_recMail->Wrapper()->fetchDecodedPart( m_recMail, m_body->Parts()[ ( ( AttachItem* )item )->Partnumber() ] );
                 if (content)
                 {
                     QFile output(str);
                     output.open(IO_WriteOnly);
                     output.writeBlock(content->Content(),content->Length());
                     output.close();
                     delete content;
                 }
             }
         }
         break ;
 
-    case 2: 
+    case 2:
         {
             QString tmpfile = "/tmp/opiemail-image";
             encodedString*content = m_recMail->Wrapper()->fetchDecodedPart( m_recMail, m_body->Parts()[ ( ( AttachItem* )item )->Partnumber() ] );
             if (content) {
                 QFile output(tmpfile);
                 output.open(IO_WriteOnly);
                 output.writeBlock(content->Content(),content->Length());
                 output.close();
                 delete content;
                 MailImageDlg iview("");
                 iview.setName(tmpfile);
                 QPEApplication::execDialog(&iview);
                 output.remove();
             }
         }
         break;
@@ -276,33 +276,33 @@ void ViewMail::slotItemClicked( QListViewItem * item , const QPoint & point, int
                 browser->setText( m_recMail->Wrapper()->fetchTextPart( m_recMail, m_body->Parts()[ ( ( AttachItem* )item )->Partnumber() ] ) );
             }
         }
         break;
     }
     delete menu;
 }
 
 
 void ViewMail::setMail(const RecMailP&mail )
 {
 
     m_recMail = mail;
 
     m_mail[0] = mail->getFrom();
     m_mail[1] = mail->getSubject();
-    m_mail[3] = mail->getDate();
+    m_mail[3] = mail->getStringDate();
     m_mail[4] = mail->Msgid();
 
     m_mail2[0] = mail->To();
     m_mail2[1] = mail->CC();
     m_mail2[2] = mail->Bcc();
 
     setText();
 }
 
 
 
 ViewMail::ViewMail( QWidget *parent, const char *name, WFlags fl)
         : ViewMailBase(parent, name, fl), _inLoop(false)
 {
     m_gotBody = false;
     deleted = false;