3 files changed, 4 insertions, 4 deletions

diff --git a/noncore/net/mail/mainwindow.cpp b/noncore/net/mail/mainwindow.cpp
index f19f93d..3edfff1 100644
--- a/noncore/net/mail/mainwindow.cpp
+++ b/noncore/net/mail/mainwindow.cpp
@@ -64,122 +64,122 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags )
                                 0, 0, this );
     editSettings->addTo( settingsMenu );
 
     editAccounts = new QAction( tr( "Configure accounts" ), ICON_EDITACCOUNTS,
                                 0, 0, this );
     editAccounts->addTo( settingsMenu );
 
     QWidget *view = new QWidget(  this );
     setCentralWidget( view );
 
     layout = new QBoxLayout ( view, QBoxLayout::LeftToRight );
 
     folderView = new AccountView( view );
     folderView->header()->hide();
     folderView->addColumn( tr( "Mailbox" ) );
     folderView->hide();
 
     layout->addWidget( folderView );
 
     mailView = new QListView( view );
     mailView->addColumn( tr( "Subject" ),QListView::Manual );
     mailView->addColumn( tr( "Sender" ),QListView::Manual );
     mailView->addColumn( tr( "Date" ));
     mailView->setAllColumnsShowFocus(true);
     mailView->setSorting(-1);
 
     layout->addWidget( mailView );
     layout->setStretchFactor( folderView, 1 );
     layout->setStretchFactor( mailView, 2 );
 
     slotAdjustLayout();
 
     connect( mailView, SIGNAL( clicked( QListViewItem * ) ),this,
              SLOT( displayMail( QListViewItem * ) ) );
 
     connect(folderView,SIGNAL(refreshMailview(QList<RecMail>*)),this,SLOT(refreshMailView(QList<RecMail>*)));
 
    QTimer::singleShot( 1000, this, SLOT(  slotAdjustColumns() ) );
 }
 
 
 void MainWindow::slotAdjustLayout() {
 
   QWidget *d = QApplication::desktop();
 
   if ( d->width() < d->height() ) {
     layout->setDirection( QBoxLayout::TopToBottom );
     } else {
     layout->setDirection( QBoxLayout::LeftToRight );
   }
   delete d;
 }
 
 void MainWindow::slotAdjustColumns()
 {
     bool hidden = folderView->isHidden();
     if ( hidden ) folderView->show();
     folderView->setColumnWidth( 0, folderView->visibleWidth() );
     if ( hidden ) folderView->hide();
 
     mailView->setColumnWidth( 0, mailView->visibleWidth() - 130 );
     mailView->setColumnWidth( 1, 80 );
     mailView->setColumnWidth( 2, 50 );
 }
 
 void MainWindow::slotShowFolders( bool show )
 {
     qDebug( "Show Folders" );
     if ( show && folderView->isHidden() ) {
         qDebug( "-> showing" );
         folderView->show();
     } else if ( !show && !folderView->isHidden() ) {
         qDebug( "-> hiding" );
         folderView->hide();
     }
 }
 
 void MainWindow::refreshMailView(QList<RecMail>*list)
 {
     MailListViewItem*item = 0;
     mailView->clear();
     for (unsigned int i = 0; i < list->count();++i) {
         item = new MailListViewItem(mailView,item);
         item->storeData(*(list->at(i)));
         item->showEntry();
     }
 }
 void MainWindow::displayMail(QListViewItem*item)
 {
     if (!item) return;
     qDebug("View mail");
     RecMail mail = ((MailListViewItem*)item)->data();
     RecBody body = folderView->fetchBody(mail);
 
     ViewMail readMail( this );
 
-    readMail.setMailInfo( mail.getFrom(), mail.To(), mail.getSubject(), mail.CC(), mail.Bcc(), mail.getDate(),  body.Bodytext() );
+    readMail.setMailInfo( mail.getFrom(), mail.To(), mail.getSubject(), mail.CC(), mail.Bcc(), mail.getDate(),  body.Bodytext(), mail.Msgid() );
     readMail.showMaximized();
     readMail.exec();
 }
 
 MailListViewItem::MailListViewItem(QListView * parent, MailListViewItem * after )
         :QListViewItem(parent,after),mail_data()
 {
 }
 
 void MailListViewItem::showEntry()
 {
     setText(0,mail_data.getSubject());
     setText(1,mail_data.getFrom());
     setText(2,mail_data.getDate());
 }
 
 void MailListViewItem::storeData(const RecMail&data)
 {
     mail_data = data;
 }
 
 const RecMail& MailListViewItem::data()const
 {
     return mail_data;
 }
diff --git a/noncore/net/mail/viewmail.cpp b/noncore/net/mail/viewmail.cpp
index 8f9ea07..7969235 100644
--- a/noncore/net/mail/viewmail.cpp
+++ b/noncore/net/mail/viewmail.cpp
@@ -1,133 +1,133 @@
 #include <qtextbrowser.h>
 #include <qmessagebox.h>
 #include <qaction.h>
 #include <qapplication.h>
 
 #include "settings.h"
 #include "composemail.h"
 #include "viewmail.h"
 
 AttachItem::AttachItem(QListView *parent, AttachItemStore &attachItemStore)
         : QListViewItem(parent), _attachItemStore(attachItemStore)
 {
         setText(0, _attachItemStore.mimeType());
         setText(1, _attachItemStore.fileName());
         setText(2, _attachItemStore.description());
 }
 
 AttachItem::AttachItem(QListViewItem *parent, AttachItemStore &attachItemStore)
         : QListViewItem(parent), _attachItemStore(attachItemStore)
 {
         setText(0, _attachItemStore.mimeType());
         setText(1, _attachItemStore.fileName());
         setText(2, _attachItemStore.description());
 }
 
-void ViewMail::setMailInfo( const QString & from, const QStringList & to, const QString & subject, const QStringList & cc, const QStringList & bcc, const QString & date, const QString & bodytext ) {
+void ViewMail::setMailInfo( const QString & from, const QStringList & to, const QString & subject, const QStringList & cc, const QStringList & bcc, const QString & date, const QString & bodytext, const QString & messageID ) {
 
 m_mail[0] = from;
 m_mail2[0] = to;
 m_mail[1] = subject;
 m_mail2[1] = cc;
 m_mail2[2] = bcc;
 m_mail[2] = bodytext;
 m_mail[3] = date;
+m_mail[4] = messageID;
 
 setText();
-
 }
 
 
 ViewMail::ViewMail( QWidget *parent, const char *name, WFlags fl)
         : ViewMailBase(parent, name, fl), _inLoop(false)
 {
         _gotBody = false;
 
         connect(reply, SIGNAL(activated()), SLOT(slotReply()));
         connect(forward, SIGNAL(activated()), SLOT(slotForward()));
 
         attachments->setEnabled(_gotBody);
 
         //_handler->iUid("FETCH", QString("%1 (BODY[1])").arg(mail.uid()));
         //connect(_handler, SIGNAL(gotResponse(IMAPResponse &)), SLOT(slotIMAPUid(IMAPResponse &)));
 }
 
 void ViewMail::setText()
 {
 
   QString toString;
   QString ccString;
   QString bccString;
 
   for ( QStringList::Iterator it = ( m_mail2[0] ).begin(); it != ( m_mail2[0] ).end(); ++it ) {
                   toString += (*it);
   }
   for ( QStringList::Iterator it = ( m_mail2[1] ).begin(); it != ( m_mail2[1] ).end(); ++it ) {
                   ccString += (*it);
   }
   for ( QStringList::Iterator it = ( m_mail2[2] ).begin(); it != ( m_mail2[2] ).end(); ++it ) {
                   bccString += (*it);
   }
 
  setCaption( caption().arg( m_mail[0] ) );
 
      _mailHtml = tr(
                 "<html><body>"
                 "<div align=center><b><font color=#0000FF>%1</b></font></div>"
                 "<b>From:</b><font color=#6C86C0> %2</font><br>"
                 "<b>To:</b><font color=#6C86C0> %3</font><br>"
                 "%4"
                     "<b>Date:</b> %5<hr>"
                 "<font face=fixed>")
                 .arg( deHtml( m_mail[1] ) )
                 .arg( deHtml( m_mail[0] ) )
                 .arg( deHtml( toString ) )
                 .arg( tr("<b>Cc:</b> %1<br>").arg( deHtml( ccString ) ) )
                 .arg( m_mail[3] );
         browser->setText( QString(_mailHtml) + deHtml( m_mail[2] ) + "</font>" );
         // remove later in favor of a real handling
         _gotBody = true;
 }
 
 
 
 ViewMail::~ViewMail()
 {
         hide();
 }
 
 void ViewMail::hide()
 {
         QWidget::hide();
 
         if (_inLoop) {
                 _inLoop = false;
                 qApp->exit_loop();
         }
 }
 
 void ViewMail::exec()
 {
         show();
 
         if (!_inLoop) {
                 _inLoop = true;
                 qApp->enter_loop();
         }
 }
 
 QString ViewMail::deHtml(const QString &string)
 {
         QString string_ = string;
         string_.replace(QRegExp("&"), "&amp;");
         string_.replace(QRegExp("<"), "&lt;");
         string_.replace(QRegExp(">"), "&gt;");
         string_.replace(QRegExp("\\n"), "<br>");
         return string_;
 }
 
 void ViewMail::slotReply()
 {
         if (!_gotBody) {
                 QMessageBox::information(this, tr("Error"), tr("<p>The mail body is not yet downloaded, so you cannot reply yet."), tr("Ok"));
                 return;
diff --git a/noncore/net/mail/viewmail.h b/noncore/net/mail/viewmail.h
index 615939a..258c09b 100644
--- a/noncore/net/mail/viewmail.h
+++ b/noncore/net/mail/viewmail.h
@@ -1,85 +1,85 @@
 #ifndef VIEWMAIL_H
 #define VIEWMAIL_H
 
 #include <qlistview.h>
 #include <qmap.h>
 #include <qstringlist.h>
 
 #include "viewmailbase.h"
 //#include "imapresponse.h"
 //#include "mailtable.h"
 
 class AttachItemStore 
 {
 public:
         void setMimeType(QString mimeType) { _mimeType = mimeType; }
         QString mimeType() { return _mimeType; }
         void setFileName(QString fileName) { _fileName = fileName; }
         QString fileName() { return _fileName; }
         void setDescription(QString description) { _description = description; }
         QString description() { return _description; }
         void setPartNum(QString partNum) { _partNum = partNum; }
         QString partNum() { return _partNum; }
 
 private:
         QString _mimeType, _fileName, _description, _partNum;
 
 };
 
 class AttachItem : public QListViewItem
 {
 public:
         AttachItem(QListView *parent, AttachItemStore &attachment);
         AttachItem(QListViewItem *parent, AttachItemStore &attachment);
 
         AttachItemStore attachItemStore() { return _attachItemStore; }
 
 private:
         AttachItemStore _attachItemStore;
 
 };
 
 class ViewMail : public ViewMailBase
 {
         Q_OBJECT
 
 public:
         ViewMail(  QWidget *parent = 0, const char *name = 0, WFlags fl = Qt::WType_Modal);
         ~ViewMail();
 
         void hide();
         void exec();
     static QString appName() { return QString::fromLatin1("mail"); }
-        void setMailInfo( const QString & from, const QStringList & to, const QString & subject, const QStringList & cc, const QStringList & bcc,const QString & date, const QString & bodytext );
+        void setMailInfo( const QString & from, const QStringList & to, const QString & subject, const QStringList & cc, const QStringList & bcc,const QString & date, const QString & bodytext, const QString & messageID );
 
 protected:
         //void fillList(IMAPResponseBODYSTRUCTURE &structure);
         QString deHtml(const QString &string);
 
 protected slots:
         void slotReply();
         void slotForward();
         void setText();
 
         //void slotIMAPUid(IMAPResponse &response);
 
 private:
         bool _inLoop;
         //IMAPResponseFETCH _mail;
         //IMAPHandler *_handler;
         QString _mailHtml;
         bool _gotBody;
 
         // 0 from
         // 1 subject
         // 2 bodytext
         // 3 date
         QMap <int,QString>  m_mail;
         // 0 to
         // 1 cc
         // 2 bcc
         QMap <int,QStringList> m_mail2;
 
 };
 
 #endif