18 files changed, 309 insertions, 39 deletions

diff --git a/noncore/net/mail/accountitem.cpp b/noncore/net/mail/accountitem.cpp
index 0d636a4..396dcb7 100644
--- a/noncore/net/mail/accountitem.cpp
+++ b/noncore/net/mail/accountitem.cpp
@@ -910,15 +910,15 @@ void MHfolderItem::initName()
     {
         setPixmap( 0, PIXMAP_OUTBOXFOLDER );
     }
     else if (bName.lower() == "inbox")
     {
         setPixmap( 0, PIXMAP_INBOXFOLDER);
-    }
-    else
-    {
+    } else if (bName.lower() == "drafts") {
+        setPixmap(0, Resource::loadPixmap("inline/edit"));
+    } else {
         setPixmap( 0, PIXMAP_MBOXFOLDER );
     }
     setText( 0, bName );
 }
 
 Folder*MHfolderItem::getFolder()
@@ -1020,12 +1020,18 @@ void MHfolderItem::contextMenuSelected(int which)
         break;
     default:
         break;
     }
 }
 
+bool MHfolderItem::isDraftfolder()
+{
+    if (folder && folder->getName()==AbstractMail::defaultLocalfolder()+"/"+AbstractMail::draftFolder()) return true;
+    return false;
+}
+
 /**
  * Generic stuff
  */
 
 const QString AccountViewItem::contextName="AccountViewItem";
 
@@ -1124,6 +1130,11 @@ AccountViewItem*AccountViewItem::findSubItem(const QString&path,AccountViewItem*
             }
         }
         pitem=(AccountViewItem*)pitem->nextSibling();
     }
     return pitem;
 }
+
+bool AccountViewItem::isDraftfolder()
+{
+    return false;
+}
diff --git a/noncore/net/mail/accountitem.h b/noncore/net/mail/accountitem.h
index f3c0f5d..eb3baa3 100644
--- a/noncore/net/mail/accountitem.h
+++ b/noncore/net/mail/accountitem.h
@@ -27,12 +27,13 @@ public:
     virtual void refresh(QList<RecMail>&)=0;
     virtual RecBody fetchBody(const RecMail&)=0;
     virtual QPopupMenu * getContextMenu(){return 0;};
     virtual void contextMenuSelected(int){}
     virtual AccountView*accountView();
     virtual bool matchName(const QString&name)const;
+    virtual bool isDraftfolder();
 
 protected:
     AccountViewItem*findSubItem(const QString&path,AccountViewItem*start=0);
     virtual void init();
     virtual void removeChilds();
     virtual void deleteAllMail(AbstractMail*wrapper,Folder*f);
@@ -190,12 +191,13 @@ public:
     virtual ~MHfolderItem();
     virtual void refresh(QList<RecMail>&);
     virtual RecBody fetchBody(const RecMail&);
     virtual QPopupMenu * getContextMenu();
     virtual void contextMenuSelected(int);
     virtual Folder*getFolder();
+    virtual bool isDraftfolder();
 
 protected:
     void downloadMails();
     virtual void createFolder();
     virtual void deleteFolder();
     void initName();
diff --git a/noncore/net/mail/accountview.cpp b/noncore/net/mail/accountview.cpp
index 4375044..7938d4f 100644
--- a/noncore/net/mail/accountview.cpp
+++ b/noncore/net/mail/accountview.cpp
@@ -165,6 +165,13 @@ void AccountView::downloadMails(Folder*fromFolder,AbstractMail*fromWrapper)
     }
     qDebug("Targetfolder: %s",targetFolder.latin1());
     qDebug("Fromfolder: %s",fromFolder->getName().latin1());
     fromWrapper->mvcpAllMails(fromFolder,targetFolder,targetMail,sels.moveMails());
     refreshCurrent();
 }
+
+bool AccountView::currentisDraft()
+{
+    AccountViewItem *view = static_cast<AccountViewItem *>(currentItem());
+    if (!view) return false;
+    return view->isDraftfolder();
+}
diff --git a/noncore/net/mail/accountview.h b/noncore/net/mail/accountview.h
index 9f92090..5000202 100644
--- a/noncore/net/mail/accountview.h
+++ b/noncore/net/mail/accountview.h
@@ -20,12 +20,13 @@ class AccountView : public QListView
 public:
     AccountView( QWidget *parent = 0, const char *name = 0, WFlags flags = 0 );
     virtual ~AccountView();
     virtual void populate( QList<Account> list );
     virtual RecBody fetchBody(const RecMail&aMail);
     virtual void downloadMails(Folder*fromFolder,AbstractMail*fromWrapper);
+    virtual bool currentisDraft();
 
 public slots:
     virtual void refreshAll();
     virtual void refresh(QListViewItem *item);
     virtual void refreshCurrent();
     virtual void slotHold(int, QListViewItem *,const QPoint&,int);
diff --git a/noncore/net/mail/composemail.cpp b/noncore/net/mail/composemail.cpp
index b5cd75b..b9c9cbc 100644
--- a/noncore/net/mail/composemail.cpp
+++ b/noncore/net/mail/composemail.cpp
@@ -6,12 +6,15 @@
 #include <qpe/global.h>
 #include <qpe/contact.h>
 
 #include "composemail.h"
 
 #include <libmailwrapper/smtpwrapper.h>
+#include <libmailwrapper/storemail.h>
+#include <libmailwrapper/abstractmail.h>
+#include <libmailwrapper/mailtypes.h>
 
 ComposeMail::ComposeMail( Settings *s, QWidget *parent, const char *name, bool modal, WFlags flags )
     : ComposeMailUI( parent, name, modal, flags )
 {
     settings = s;
     m_replyid = "";
@@ -121,13 +124,13 @@ void ComposeMail::pickAddressBCC()
 
 void ComposeMail::pickAddressReply()
 {
     pickAddress( replyLine );
 }
 
-void ComposeMail::fillValues( int current )
+void ComposeMail::fillValues( int )
 {
 #if 0
     SMTPaccount *smtp = smtpAccounts.at( current );
     ccLine->clear();
     if ( smtp->getUseCC() ) {
         ccLine->setText( smtp->getCC() );
@@ -182,52 +185,111 @@ void ComposeMail::accept()
     }
 
 #if 0
     qDebug( "Sending Mail with " +
             smtpAccounts.at( smtpAccountBox->currentItem() )->getAccountName() );
 #endif
-    Mail *mail = new Mail();
+    Mail mail;
 
     SMTPaccount *smtp = smtpAccounts.at( smtpAccountBox->currentItem() );
-    mail->setMail(fromBox->currentText());
+    mail.setMail(fromBox->currentText());
 
     if ( !toLine->text().isEmpty() ) {
-        mail->setTo( toLine->text() );
+        mail.setTo( toLine->text() );
     } else {
-        qDebug( "No Reciever spezified -> returning" );
+        QMessageBox::warning(0,tr("Sending mail"),
+            tr("No Receiver spezified" ) );
         return;
     }
-    mail->setName(senderNameEdit->text());
-    mail->setCC( ccLine->text() );
-    mail->setBCC( bccLine->text() );
-    mail->setReply( replyLine->text() );
-    mail->setSubject( subjectLine->text() );
+    mail.setName(senderNameEdit->text());
+    mail.setCC( ccLine->text() );
+    mail.setBCC( bccLine->text() );
+    mail.setReply( replyLine->text() );
+    mail.setSubject( subjectLine->text() );
     if (!m_replyid.isEmpty()) {
         QStringList ids;
         ids.append(m_replyid);
-        mail->setInreply(ids);
+        mail.setInreply(ids);
     }
     QString txt = message->text();
     if ( !sigMultiLine->text().isEmpty() ) {
         txt.append( "\n--\n" );
         txt.append( sigMultiLine->text() );
     }
     qDebug(txt);
-    mail->setMessage( txt );
+    mail.setMessage( txt );
     AttachViewItem *it = (AttachViewItem *) attList->firstChild();
     while ( it != NULL ) {
-        mail->addAttachment( it->getAttachment() );
+        mail.addAttachment( it->getAttachment() );
         it = (AttachViewItem *) it->nextSibling();
     }
 
     SMTPwrapper wrapper( smtp );
-    wrapper.sendMail( *mail,checkBoxLater->isChecked() );
+    wrapper.sendMail( mail,checkBoxLater->isChecked() );
 
     QDialog::accept();
 }
 
+void ComposeMail::reject()
+{
+    int yesno = QMessageBox::warning(0,tr("Store message"),
+                                     tr("Store message into drafts?"),
+                                     tr("Yes"),
+                                     tr("No"),QString::null,0,1);
+
+    if (yesno == 0) {
+        Mail mail;
+        mail.setMail(fromBox->currentText());
+        mail.setTo( toLine->text() );
+        mail.setName(senderNameEdit->text());
+        mail.setCC( ccLine->text() );
+        mail.setBCC( bccLine->text() );
+        mail.setReply( replyLine->text() );
+        mail.setSubject( subjectLine->text() );
+        if (!m_replyid.isEmpty()) {
+            QStringList ids;
+            ids.append(m_replyid);
+            mail.setInreply(ids);
+        }
+        QString txt = message->text();
+        if ( !sigMultiLine->text().isEmpty() ) {
+            txt.append( "\n--\n" );
+            txt.append( sigMultiLine->text() );
+        }
+        qDebug(txt);
+        mail.setMessage( txt );
+        
+        /* only use the default drafts folder name! */
+        Storemail wrapper(AbstractMail::draftFolder());
+        wrapper.storeMail(mail);
+        
+        AttachViewItem *it = (AttachViewItem *) attList->firstChild();
+        /* attachments we will ignore! */
+        if ( it != NULL ) {
+            QMessageBox::warning(0,tr("Store message"),
+                tr("<center>Attachments will not be stored in \"Draft\" folder</center>"));
+        }
+    }
+    QDialog::reject();
+}
+
+ComposeMail::~ComposeMail()
+{
+}
+
+void ComposeMail::reEditMail(const RecMail&current)
+{
+    RecMail data = current;
+    message->setText(data.Wrapper()->fetchBody(current).Bodytext());
+    subjectLine->setText( data.getSubject());
+    toLine->setText(data.To().join(","));
+    ccLine->setText(data.CC().join(","));
+    bccLine->setText(data.Bcc().join(","));
+    replyLine->setText(data.Replyto());
+}
+
 AttachViewItem::AttachViewItem( QListView *parent, Attachment *att )
     : QListViewItem( parent )
 {
     attachment = att;
     qDebug( att->getMimeType() );
     setPixmap( 0, attachment->getDocLnk().pixmap().isNull() ?
diff --git a/noncore/net/mail/composemail.h b/noncore/net/mail/composemail.h
index 886fb1d..1b9fc79 100644
--- a/noncore/net/mail/composemail.h
+++ b/noncore/net/mail/composemail.h
@@ -10,43 +10,48 @@
 #include <libmailwrapper/mailwrapper.h>
 
 
 
 class AddressPicker : public AddressPickerUI
 {
-        Q_OBJECT
+    Q_OBJECT
 
 public:
-        AddressPicker( QWidget *parent = 0, const char *name = 0, bool modal = false, WFlags flags = 0 );
-        static QString getNames();
+    AddressPicker( QWidget *parent = 0, const char *name = 0, bool modal = false, WFlags flags = 0 );
+    static QString getNames();
 
 protected:
-        QString selectedNames;
-        void accept();
+    QString selectedNames;
+    void accept();
 
 };
 
+class RecMail;
 
 class ComposeMail : public ComposeMailUI
 {
     Q_OBJECT
-    
+
 public:
     ComposeMail( Settings *s, QWidget *parent = 0, const char *name = 0, bool modal = false, WFlags flags = 0 );
+    virtual ~ComposeMail();
+
+    void reEditMail(const RecMail&current);
 
 public slots:
     void slotAdjustColumns();
 
     void setTo( const QString & to );
     void setSubject( const QString & subject );
     void setInReplyTo( const QString & messageId );
     void setMessage( const QString & text );
 
 protected slots:
     void accept();
-    
+    void reject();
+
 private slots:
     void fillValues( int current );
     void pickAddress( QLineEdit *line );
     void pickAddressTo();
     void pickAddressCC();
     void pickAddressBCC();
@@ -59,16 +64,16 @@ protected:
     QList<SMTPaccount> smtpAccounts;
     QString m_replyid;
 };
 
 class AttachViewItem : public QListViewItem
 {
-        public:
+public:
     AttachViewItem( QListView *parent, Attachment *att );
-        Attachment *getAttachment() { return attachment; }
+    Attachment *getAttachment() { return attachment; }
 
 private:
-        Attachment *attachment;
+    Attachment *attachment;
 
 };
 
 #endif
diff --git a/noncore/net/mail/libmailwrapper/abstractmail.cpp b/noncore/net/mail/libmailwrapper/abstractmail.cpp
index 9960f88..d71d35c 100644
--- a/noncore/net/mail/libmailwrapper/abstractmail.cpp
+++ b/noncore/net/mail/libmailwrapper/abstractmail.cpp
@@ -28,12 +28,30 @@ AbstractMail* AbstractMail::getWrapper(NNTPaccount *a)
 
 AbstractMail* AbstractMail::getWrapper(const QString&a,const QString&name)
 {
     return new MHwrapper(a,name);
 }
 
+AbstractMail* AbstractMail::getWrapper(Account*a)
+{
+    if (!a) return 0;
+    switch (a->getType()) {
+        case MAILLIB::A_IMAP:
+            return new IMAPwrapper((IMAPaccount*)a);
+            break;
+        case MAILLIB::A_POP3:
+            return new POP3wrapper((POP3account*)a);
+            break;
+        case MAILLIB::A_NNTP:
+            return new NNTPwrapper((NNTPaccount*)a);
+            break;
+        default:
+            return 0;
+    }
+}
+
 encodedString* AbstractMail::decode_String(const encodedString*text,const QString&enc)
 {
     qDebug("Decode string start");
     char*result_text;
     size_t index = 0;
     /* reset for recursive use! */
@@ -102,12 +120,17 @@ QString AbstractMail::defaultLocalfolder()
 {
     QString f = getenv( "HOME" );
     f += "/Applications/opiemail/localmail";
     return f;
 }
 
+QString AbstractMail::draftFolder()
+{
+    return QString("Drafts");
+}
+
 /* temporary - will be removed when implemented in all classes */
 void AbstractMail::deleteMails(const QString &,QList<RecMail> &)
 {
 }
 
 void AbstractMail::mvcpAllMails(Folder*fromFolder,const QString&targetFolder,AbstractMail*targetWrapper,bool moveit)
diff --git a/noncore/net/mail/libmailwrapper/abstractmail.h b/noncore/net/mail/libmailwrapper/abstractmail.h
index 442ebfe..d377452 100644
--- a/noncore/net/mail/libmailwrapper/abstractmail.h
+++ b/noncore/net/mail/libmailwrapper/abstractmail.h
@@ -37,29 +37,31 @@ public:
     virtual int deleteMbox(const Folder*)=0;
     virtual void storeMessage(const char*msg,size_t length, const QString&folder)=0;
 
     virtual void mvcpAllMails(Folder*fromFolder,const QString&targetFolder,AbstractMail*targetWrapper,bool moveit);
     virtual void mvcpMail(const RecMail&mail,const QString&targetFolder,AbstractMail*targetWrapper,bool moveit);
 
-    virtual void cleanMimeCache(){};    
+    virtual void cleanMimeCache(){};
     /* mail box methods */
     /* parameter is the box to create.
-     * if the implementing subclass has prefixes, 
+     * if the implementing subclass has prefixes,
      * them has to be appended automatic.
      */
     virtual int createMbox(const QString&,const Folder*parentfolder=0,const QString& delemiter="/",bool getsubfolder=false);
     virtual void logout()=0;
-    
+
     static AbstractMail* getWrapper(IMAPaccount *a);
     static AbstractMail* getWrapper(POP3account *a);
     static AbstractMail* getWrapper(NNTPaccount *a);
     /* mbox only! */
     static AbstractMail* getWrapper(const QString&a,const QString&name="Local Folders");
+    static AbstractMail* getWrapper(Account*a);
 
     static QString defaultLocalfolder();
-    
+    static QString draftFolder();
+
     virtual MAILLIB::ATYPE getType()const=0;
     virtual const QString&getName()const=0;
 
 protected:
     static encodedString*decode_String(const encodedString*text,const QString&enc);
     static QString convert_String(const char*text);
diff --git a/noncore/net/mail/libmailwrapper/genericwrapper.cpp b/noncore/net/mail/libmailwrapper/genericwrapper.cpp
index 137a6ef..ffa049f 100644
--- a/noncore/net/mail/libmailwrapper/genericwrapper.cpp
+++ b/noncore/net/mail/libmailwrapper/genericwrapper.cpp
@@ -447,17 +447,25 @@ void Genericwrapper::parseList(QList<RecMail> &target,mailsession*session,const
         // crashes when accessing pop3 account?
         if (single_fields.fld_message_id->mid_value) {
             mail->setMsgid(QString(single_fields.fld_message_id->mid_value));
             qDebug("Msgid == %s",mail->Msgid().latin1());
         }
 
+        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));
         }
         target.append(mail);
     }
diff --git a/noncore/net/mail/libmailwrapper/libmailwrapper.pro b/noncore/net/mail/libmailwrapper/libmailwrapper.pro
index cb1e573..d28079e 100644
--- a/noncore/net/mail/libmailwrapper/libmailwrapper.pro
+++ b/noncore/net/mail/libmailwrapper/libmailwrapper.pro
@@ -12,13 +12,14 @@ HEADERS         = mailwrapper.h \
                settings.h \
                logindialog.h \
                sendmailprogress.h \
                statusmail.h \
                mhwrapper.h \
                nntpwrapper.h \
-               generatemail.h
+               generatemail.h \
+               storemail.h
 
 SOURCES         = imapwrapper.cpp \
                mailwrapper.cpp \
                mailtypes.cpp \
                pop3wrapper.cpp \
                abstractmail.cpp \
@@ -28,13 +29,14 @@ SOURCES         = imapwrapper.cpp \
                settings.cpp \
                logindialog.cpp \
                sendmailprogress.cpp \
                statusmail.cpp \
                mhwrapper.cpp \
               nntpwrapper.cpp \
-              generatemail.cpp
+              generatemail.cpp \
+              storemail.cpp
 
 INTERFACES     = logindialogui.ui \
               sendmailprogressui.ui
 
 
 INCLUDEPATH += $(OPIEDIR)/include
diff --git a/noncore/net/mail/libmailwrapper/mailtypes.cpp b/noncore/net/mail/libmailwrapper/mailtypes.cpp
index e4646d9..49b3caa 100644
--- a/noncore/net/mail/libmailwrapper/mailtypes.cpp
+++ b/noncore/net/mail/libmailwrapper/mailtypes.cpp
@@ -33,12 +33,13 @@ void RecMail::copy_old(const RecMail&old)
     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();
diff --git a/noncore/net/mail/libmailwrapper/storemail.cpp b/noncore/net/mail/libmailwrapper/storemail.cpp
new file mode 100644
index 0000000..53101f8
--- a/dev/null
+++ b/noncore/net/mail/libmailwrapper/storemail.cpp
@@ -0,0 +1,90 @@
+#include "storemail.h"
+#include "mailwrapper.h"
+#include "settings.h"
+#include "abstractmail.h"
+
+#include <libetpan/libetpan.h>
+
+#include <qstring.h>
+
+#include <stdlib.h>
+
+Storemail::Storemail(Account*aAccount,const QString&aFolder)
+    : Generatemail()
+{
+    wrapper = 0;
+    m_Account = aAccount;
+    m_tfolder = aFolder;
+    wrapper = AbstractMail::getWrapper(m_Account);
+    if (wrapper) {
+        wrapper->createMbox(m_tfolder);
+    }
+}
+
+Storemail::Storemail(const QString&dir,const QString&aFolder)
+    : Generatemail()
+{
+    wrapper = 0;
+    m_Account = 0;
+    m_tfolder = aFolder;
+    wrapper = AbstractMail::getWrapper(dir);
+    if (wrapper) {
+        wrapper->createMbox(m_tfolder);
+    }
+}
+
+Storemail::Storemail(const QString&aFolder)
+    : Generatemail()
+{
+    wrapper = 0;
+    m_Account = 0;
+    m_tfolder = aFolder;
+    wrapper = AbstractMail::getWrapper(AbstractMail::defaultLocalfolder());
+    if (wrapper) {
+        wrapper->createMbox(m_tfolder);
+    }
+}
+
+Storemail::~Storemail()
+{
+}
+
+int Storemail::storeMail(const Mail&mail)
+{
+    if (!wrapper) return 0;
+    int ret = 1;
+
+    mailmime * mimeMail = 0;
+    mimeMail = createMimeMail(mail );
+    if ( mimeMail == NULL ) {
+        qDebug( "storeMail: error creating mime mail" );
+        return 0;
+    }
+    char *data;
+    size_t size;
+    data = 0;
+
+    mailmessage * msg = 0;
+    msg = mime_message_init(mimeMail);
+    mime_message_set_tmpdir(msg,getenv( "HOME" ));
+    int r = mailmessage_fetch(msg,&data,&size);
+    mime_message_detach_mime(msg);
+    mailmessage_free(msg);
+    msg = 0;
+    if (r != MAIL_NO_ERROR || !data) {
+        qDebug("Error fetching mime...");
+        ret = 0;
+    }
+
+    if (ret) {
+        wrapper->storeMessage(data,size,m_tfolder);
+    }
+
+    if (data) {
+        free(data);
+    }
+    if (mimeMail) {
+        mailmime_free( mimeMail );
+    }
+    return ret;
+}
diff --git a/noncore/net/mail/libmailwrapper/storemail.h b/noncore/net/mail/libmailwrapper/storemail.h
new file mode 100644
index 0000000..872c981
--- a/dev/null
+++ b/noncore/net/mail/libmailwrapper/storemail.h
@@ -0,0 +1,29 @@
+#ifndef __STORE_MAIL_H
+#define __STORE_MAIL_H
+
+#include <qpe/applnk.h>
+
+#include "generatemail.h"
+
+class Account;
+class Mail;
+class AbstractMail;
+
+class Storemail : public Generatemail
+{
+    Q_OBJECT
+public:
+    Storemail(Account*aAccount,const QString&aFolder);
+    Storemail(const QString&dir,const QString&aFolder);
+    Storemail(const QString&aFolder);
+    virtual ~Storemail();
+
+    int storeMail(const Mail&mail);
+
+protected:
+    Account* m_Account;
+    QString m_tfolder;
+    AbstractMail*wrapper;
+};
+
+#endif
diff --git a/noncore/net/mail/mailistviewitem.cpp b/noncore/net/mail/mailistviewitem.cpp
index f224dc3..75633ef 100644
--- a/noncore/net/mail/mailistviewitem.cpp
+++ b/noncore/net/mail/mailistviewitem.cpp
@@ -1,7 +1,8 @@
 #include "mailistviewitem.h"
+#include <libmailwrapper/abstractmail.h>
 #include <qtextstream.h>
 #include <qpe/resource.h>
 
 MailListViewItem::MailListViewItem(QListView * parent, MailListViewItem * item )
         :QListViewItem(parent,item),mail_data()
 {
@@ -60,6 +61,12 @@ void MailListViewItem::storeData(const RecMail&data)
 }
 
 const RecMail& 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 3b352a2..f736de0 100644
--- a/noncore/net/mail/mailistviewitem.h
+++ b/noncore/net/mail/mailistviewitem.h
@@ -1,21 +1,23 @@
 #ifndef __MAILLISTVIEWITEM_H
 #define __MAILLISTVIEWITEM_H
 
 #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 RecMail&data);
     const RecMail&data()const;
     void showEntry();
-    
+    MAILLIB::ATYPE wrapperType();
+
 protected:
     RecMail mail_data;
 };
 
 #endif
diff --git a/noncore/net/mail/nntpgroupsdlg.cpp b/noncore/net/mail/nntpgroupsdlg.cpp
index 752ce3c..c94d9fa 100644
--- a/noncore/net/mail/nntpgroupsdlg.cpp
+++ b/noncore/net/mail/nntpgroupsdlg.cpp
@@ -3,13 +3,13 @@
 
 #include <libmailwrapper/settings.h>
 
 #include <qlayout.h>
 
 NNTPGroupsDlg::NNTPGroupsDlg(NNTPaccount *account,QWidget * parent, const char * name)
-    : QDialog(parent,name,true)
+    : QDialog(parent,name,true,WStyle_ContextHelp)
 {
     setCaption(tr("Subscribed newsgroups"));
     m_Account = account;
     QVBoxLayout*dlglayout = new QVBoxLayout(this);
     dlglayout->setSpacing(2);
     dlglayout->setMargin(1);
diff --git a/noncore/net/mail/opiemail.cpp b/noncore/net/mail/opiemail.cpp
index 61e7dc4..d95b3c9 100644
--- a/noncore/net/mail/opiemail.cpp
+++ b/noncore/net/mail/opiemail.cpp
@@ -174,24 +174,27 @@ void OpieMail::slotDeleteMail()
     }
 }
 
 void OpieMail::mailHold(int button, QListViewItem *item,const QPoint&,int  )
 {
     if (!mailView->currentItem()) return;
-    RecMail mail = ((MailListViewItem*)mailView->currentItem() )->data();
+    MAILLIB::ATYPE mailtype = ((MailListViewItem*)mailView->currentItem() )->wrapperType();
     /* just the RIGHT button - or hold on pda */
     if (button!=2) {return;}
     qDebug("Event right/hold");
     if (!item) return;
     QPopupMenu *m = new QPopupMenu(0);
     if (m)
     {
-        if (mail.Wrapper()->getType()==MAILLIB::A_NNTP) {
+        if (mailtype==MAILLIB::A_NNTP) {
             m->insertItem(tr("Read this posting"),this,SLOT(displayMail()));
 //            m->insertItem(tr("Copy this posting"),this,SLOT(slotMoveCopyMail()));
         } else {
+            if (folderView->currentisDraft()) {
+                m->insertItem(tr("Edit this mail"),this,SLOT(reEditMail()));
+            }
             m->insertItem(tr("Read this mail"),this,SLOT(displayMail()));
             m->insertItem(tr("Delete this mail"),this,SLOT(slotDeleteMail()));
             m->insertItem(tr("Copy/Move this mail"),this,SLOT(slotMoveCopyMail()));
         }
         m->setFocus();
         m->exec( QPoint( QCursor::pos().x(), QCursor::pos().y()) );
@@ -228,13 +231,17 @@ void OpieMail::refreshMailView(QList<RecMail>*list)
 
 void OpieMail::mailLeftClicked(int button, QListViewItem *item,const QPoint&,int )
 {
     /* just LEFT button - or tap with stylus on pda */
     if (button!=1) return;
     if (!item) return;
-    displayMail();
+    if (folderView->currentisDraft()) {
+        reEditMail();
+    } else {
+        displayMail();
+    }
 }
 
 void OpieMail::slotMoveCopyMail()
 {
     if (!mailView->currentItem()) return;
     RecMail mail = ((MailListViewItem*)mailView->currentItem() )->data();
@@ -256,6 +263,16 @@ void OpieMail::slotMoveCopyMail()
                               tr("<center>Error while creating<br>new folder - breaking.</center>"));
         return;
     }
     mail.Wrapper()->mvcpMail(mail,targetFolder,targetMail,sels.moveMails());
     folderView->refreshCurrent();
 }
+
+void OpieMail::reEditMail()
+{
+    if (!mailView->currentItem()) return;
+    
+    ComposeMail compose( settings, this, 0, true , WStyle_ContextHelp );
+    compose.reEditMail(((MailListViewItem*)mailView->currentItem() )->data());
+    compose.slotAdjustColumns();
+    QPEApplication::execDialog( &compose );
+}
diff --git a/noncore/net/mail/opiemail.h b/noncore/net/mail/opiemail.h
index 5821856..88c7ea1 100644
--- a/noncore/net/mail/opiemail.h
+++ b/noncore/net/mail/opiemail.h
@@ -27,12 +27,13 @@ protected slots:
     virtual void slotDeleteMail();
     virtual void mailHold(int, QListViewItem *,const QPoint&,int);
     virtual void slotShowFolders( bool show );
     virtual void refreshMailView(QList<RecMail>*);
     virtual void mailLeftClicked( int, QListViewItem *,const QPoint&,int  );
     virtual void slotMoveCopyMail();
+    virtual void reEditMail();
 
 private:
     Settings *settings;
 
 };