2 files changed, 1 insertions, 2 deletions

diff --git a/kmicromail/mailistviewitem.cpp b/kmicromail/mailistviewitem.cpp
index 15fa148..41cee52 100644
--- a/kmicromail/mailistviewitem.cpp
+++ b/kmicromail/mailistviewitem.cpp
@@ -1,99 +1,99 @@
 // CHANGED 2004-08-06 Lutz Rogowski
 #include "mailistviewitem.h"
 #include <libmailwrapper/abstractmail.h>
 #include <qtextstream.h>
 #include <kiconloader.h>
 #include "koprefs.h"
 //#include <qpe/resource.h>
 
 MailListViewItem::MailListViewItem(QListView * parent, MailListViewItem * item )
         :KListViewItem(parent,item),mail_data()
 {
 }
 
 void MailListViewItem::showEntry()
 {
     if ( mail_data->getFlags().testBit( FLAG_ANSWERED ) == true) {
         setPixmap( 0, SmallIcon ( "kmmsgreplied") );
         mKeyMap.insert(0, "r" );
     } 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
            replied or new - Alwin*/ 
         //setPixmap( 0,SmallIcon ("kmmsgunseen") );
         mKeyMap.insert(0, "s" );
     } else  {
         setPixmap( 0,SmallIcon ( "kmmsgnew") );
         mKeyMap.insert(0, "u" );
     }
     QString fsize = mail_data->MsgsizeString();
     //  1.23
     // 11.23
     // 111.23
     // 999.23 maxlen
     QString fsort; 
     switch(fsize.length() ) {
     case 6:
         fsort = "00" + fsize ;
         break;
     case 7:
         fsort = "0" + fsize ;
         break;
     default:
         fsort = fsize ;
     break;
     
     }
     
     setText(3, fsize );
     //qDebug("fsize *%s* ",fsize.latin1() );
     //qDebug("fsort *%s* ",fsort.latin1() );
     if ( fsize.right(2) == "kB" ) {
         mKeyMap.insert(3, "k" + fsort);
     } else {
         mKeyMap.insert(3, "M" +fsort );
     }
     setText(1,mail_data->getSubject());
     setText(2,mail_data->getFrom());
     mKeyMap.insert(4,mail_data->getIsoDate());
-    setText(4,mail_data->getDate());
+    setText(4," "+mail_data->getDate());
     if ( KOPrefs::instance()->mShowToField )
         setText(5,mail_data->To()[0]);
 }
 
 void MailListViewItem::storeData(const RecMailP&data)
 {
     mail_data = data;
 }
 void MailListViewItem::setSortKey(int column,const QString &key)
 {
     mKeyMap.insert(column,key);
 }
 QString MailListViewItem::key(int column, bool) const
 {
     // to make is fast, we use here special cases
     if ( column == 3  ||  column == 4 || column == 0) {
         return *mKeyMap.find(column);
     }
     if ( column == 1 ) {
         if ( text(1).left(4).lower() == "re: " )
             return text(1).mid(4);
 
     }
     return text(column);
     /*
     QMap<int,QString>::ConstIterator it = mKeyMap.find(column);
     if (it == mKeyMap.end()) return text(column);
     else return *it;
     */
 }
 
 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/kmicromail/mainwindow.cpp b/kmicromail/mainwindow.cpp
index 3dde3cd..d547dda 100644
--- a/kmicromail/mainwindow.cpp
+++ b/kmicromail/mainwindow.cpp
@@ -284,164 +284,163 @@ void MainWindow::slotSetCodec( int codec )
     KOPrefs::instance()->isDirty = true;
     QString name;
     switch ( codec ) {
     case 0:
         name = "iso-8859-1";
         break;
     case 1:
         name = "iso-8859-5";
         break;
     case 2:
         name = "iso-8859-15";
         break;
     case 3:
         name = "big-5";
         break;
     case 4:
         name = "utf-8";
         break;
     case 5:
         name = KOPrefs::instance()->mSendCodec.lower();
         break;
     }
     KOPrefs::instance()->mCurrentCodeName = name ;
     codecMenu->changeItem ( 5, "Userdefined ("+KOPrefs::instance()->mSendCodec+")");
     codecMenu->setItemChecked(KOPrefs::instance()->mCurrentCodec, true );
 }
 void  MainWindow::showLicence()
 {
     KApplication::showLicence();
 }
 void  MainWindow::showAbout()
 {
     QString version;
 #include <../version>
 
     QString cap = "About KOpieMail/Pi";
                 QString text =i18n("KOpieMail/Platform-independent\n") +
                         "(OM/Pi) " + version + " - "
                       
 #ifdef DESKTOP_VERSION
                         "Desktop Edition\n"
 #else
                        "PDA-Edition\nfor: Zaurus 5x00 / 7x0 / 8x0\n"
 #endif
                 "www.pi-sync.info\n\n"
 
 
 
 "Copyright (c) 2004 Lutz Rogowski <lutz@pi-sync.info>\n"
                 "KOpieMail/Pi is based on Opie Mail\n"
                 "Copyright (c) Rajko Albrecht and the Opie team\n"
                 "KOpieMail/Pi is licensed under the GPL\n"
                 "\n"
                 "KOpieMail/Pi uses LibEtPan - a mail stuff library\n"
         "Copyright (C) 2001, 2002 - DINH Viet Hoa\n"
                 "libEtPan has its own licence - see LibEtPan licence\n";
 
     KApplication::showText( cap, text );
 }
 void  MainWindow::showEtpanLicence()
 {
     KApplication::showFile( "LibEtPan licence", "kdepim/kopiemail/COPYRIGHTlibetpan" );
 
 } 
 void MainWindow::appMessage(const QCString &, const QByteArray &)
 {
     qDebug("appMessage implemented by subclass");
 }
 
 void MainWindow::slotAdjustLayout() {
 
     /*
   QWidget *d = QApplication::desktop();
 
   if ( d->width() < d->height() ) {
     layout->setDirection( QBoxLayout::TopToBottom );
     } else {
     layout->setDirection( QBoxLayout::LeftToRight );
   }
     */
 }
 
 void MainWindow::slotAdjustColumns()
 {
    
     if ( !folderView->isHidden() )
         folderView->setColumnWidth( 0, folderView->visibleWidth() );
 
     mailView->setColumnWidth( 0, 10 );
     mailView->setColumnWidth( 1, 100 );
     mailView->setColumnWidth( 2, 100 );
     mailView->setColumnWidth( 3, 70 );
     mailView->setColumnWidth( 4, 180 );
     if ( KOPrefs::instance()->mShowToField )
         mailView->setColumnWidth( 5, 100 );
     mailView->setColumnAlignment( 3, AlignRight);
-    mailView->setColumnAlignment( 4, AlignRight);
 }
 void MainWindow::slotAdjustColumnsWide()
 {
     if ( !folderView->isHidden() )
         folderView->setColumnWidth( 0, folderView->visibleWidth() );
 
     mailView->setColumnWidth( 0, 10 );
     mailView->setColumnWidth( 1, 200 );
     mailView->setColumnWidth( 2, 200 );
     mailView->setColumnWidth( 3, 70 );
     mailView->setColumnWidth( 4, 180 );
     if ( KOPrefs::instance()->mShowToField )
         mailView->setColumnWidth( 5, 100 );
     mailView->setColumnAlignment( 3, AlignRight);
 }
 
 void MainWindow::slotEditSettings()
 {
 }
 void MainWindow::slotEditGlobalSettings()
 {
 }
 
 void MainWindow::slotShowFolders( bool )
 {
     qDebug("not implemented:  ");
 }
 
 void MainWindow::refreshMailView(const QValueList<RecMailP>&)
 { 
     qDebug("not implemented:  ");
 }
 
 void MainWindow::mailLeftClicked(QListViewItem * )
 {
     qDebug("not implemented:  ");
 }
 
 void MainWindow::displayMail()
 {
     qDebug("not implemented:  ");
 }
 
 void MainWindow::slotDeleteMail()
 {
     qDebug("not implemented:  ");
 }
 
 void MainWindow::mailHold(int, QListViewItem *,const QPoint&,int  )
 {
     qDebug("not implemented:  ");
 }
 
 void MainWindow::slotSendQueued()
 {
     qDebug("not implemented:  ");
 }
 
 void MainWindow::slotEditAccounts()
 {
     qDebug("not implemented:  ");
 }
 
 void MainWindow::slotComposeMail()
 {
     qDebug("not implemented:  ");
 }