8 files changed, 50 insertions, 2 deletions

diff --git a/noncore/net/mail/imapwrapper.cpp b/noncore/net/mail/imapwrapper.cpp
index e5eb335..3222c7e 100644
--- a/noncore/net/mail/imapwrapper.cpp
+++ b/noncore/net/mail/imapwrapper.cpp
@@ -131,6 +131,7 @@ void IMAPwrapper::listMessages(const QString&mailbox,QList<RecMail> &target )
             if (m) {
                 m->setNumber(i);
                 m->setMbox(mailbox);
+                m->setWrapper(this);
                 target.append(m);
             }
         }
diff --git a/noncore/net/mail/libmailwrapper/imapwrapper.cpp b/noncore/net/mail/libmailwrapper/imapwrapper.cpp
index e5eb335..3222c7e 100644
--- a/noncore/net/mail/libmailwrapper/imapwrapper.cpp
+++ b/noncore/net/mail/libmailwrapper/imapwrapper.cpp
@@ -131,6 +131,7 @@ void IMAPwrapper::listMessages(const QString&mailbox,QList<RecMail> &target )
             if (m) {
                 m->setNumber(i);
                 m->setMbox(mailbox);
+                m->setWrapper(this);
                 target.append(m);
             }
         }
diff --git a/noncore/net/mail/libmailwrapper/mailtypes.cpp b/noncore/net/mail/libmailwrapper/mailtypes.cpp
index 5cd45ed..94f5d6f 100644
--- a/noncore/net/mail/libmailwrapper/mailtypes.cpp
+++ b/noncore/net/mail/libmailwrapper/mailtypes.cpp
@@ -15,6 +15,11 @@ RecMail::RecMail(const RecMail&old)
     qDebug("Copy constructor RecMail");
 }
 
+RecMail::~RecMail()
+{
+    wrapper = 0;
+}
+
 void RecMail::copy_old(const RecMail&old)
 {
     subject = old.subject;
@@ -28,6 +33,7 @@ void RecMail::copy_old(const RecMail&old)
     to = old.to;
     cc = old.cc;
     bcc = old.bcc;
+    wrapper = old.wrapper;
 }
 
 void RecMail::init()
@@ -35,6 +41,17 @@ void RecMail::init()
     to.clear();
     cc.clear();
     bcc.clear();
+    wrapper = 0;
+}
+
+void RecMail::setWrapper(AbstractMail*awrapper)
+{
+    wrapper = awrapper;
+}
+
+AbstractMail* RecMail::Wrapper()
+{
+    return wrapper;
 }
 
 void RecMail::setTo(const QStringList&list)
diff --git a/noncore/net/mail/libmailwrapper/mailtypes.h b/noncore/net/mail/libmailwrapper/mailtypes.h
index 24518cf..9ef762d 100644
--- a/noncore/net/mail/libmailwrapper/mailtypes.h
+++ b/noncore/net/mail/libmailwrapper/mailtypes.h
@@ -15,6 +15,7 @@
 #include <qmap.h>
 #include <qvaluelist.h>
 
+class AbstractMail;
 /* a class to describe mails in a mailbox */
 /* Attention!
    From programmers point of view it would make sense to
@@ -32,7 +33,7 @@ class RecMail
 public:
     RecMail();
     RecMail(const RecMail&old);
-    virtual ~RecMail(){}
+    virtual ~RecMail();
 
     const int getNumber()const{return msg_number;}
     void setNumber(int number){msg_number=number;}
@@ -60,12 +61,16 @@ public:
     const QStringList&Bcc()const;
     const QBitArray&getFlags()const{return msg_flags;}
     void setFlags(const QBitArray&flags){msg_flags = flags;}
+    
+    void setWrapper(AbstractMail*wrapper);
+    AbstractMail* Wrapper();
 
 protected:
     QString subject,date,from,mbox,msg_id,replyto;
     int msg_number,msg_size;
     QBitArray msg_flags;
     QStringList to,cc,bcc;
+    AbstractMail*wrapper;
     void init();
     void copy_old(const RecMail&old);
 };
diff --git a/noncore/net/mail/libmailwrapper/pop3wrapper.cpp b/noncore/net/mail/libmailwrapper/pop3wrapper.cpp
index 49c3b7a..903ef4d 100644
--- a/noncore/net/mail/libmailwrapper/pop3wrapper.cpp
+++ b/noncore/net/mail/libmailwrapper/pop3wrapper.cpp
@@ -81,6 +81,7 @@ void POP3wrapper::listMessages(const QString &, QList<RecMail> &target )
         }
         RecMail *mail = parseHeader( header );
         mail->setNumber( info->msg_index );
+        mail->setWrapper(this);
         target.append( mail );
     }
 
diff --git a/noncore/net/mail/mailtypes.cpp b/noncore/net/mail/mailtypes.cpp
index 5cd45ed..94f5d6f 100644
--- a/noncore/net/mail/mailtypes.cpp
+++ b/noncore/net/mail/mailtypes.cpp
@@ -15,6 +15,11 @@ RecMail::RecMail(const RecMail&old)
     qDebug("Copy constructor RecMail");
 }
 
+RecMail::~RecMail()
+{
+    wrapper = 0;
+}
+
 void RecMail::copy_old(const RecMail&old)
 {
     subject = old.subject;
@@ -28,6 +33,7 @@ void RecMail::copy_old(const RecMail&old)
     to = old.to;
     cc = old.cc;
     bcc = old.bcc;
+    wrapper = old.wrapper;
 }
 
 void RecMail::init()
@@ -35,6 +41,17 @@ void RecMail::init()
     to.clear();
     cc.clear();
     bcc.clear();
+    wrapper = 0;
+}
+
+void RecMail::setWrapper(AbstractMail*awrapper)
+{
+    wrapper = awrapper;
+}
+
+AbstractMail* RecMail::Wrapper()
+{
+    return wrapper;
 }
 
 void RecMail::setTo(const QStringList&list)
diff --git a/noncore/net/mail/mailtypes.h b/noncore/net/mail/mailtypes.h
index 24518cf..9ef762d 100644
--- a/noncore/net/mail/mailtypes.h
+++ b/noncore/net/mail/mailtypes.h
@@ -15,6 +15,7 @@
 #include <qmap.h>
 #include <qvaluelist.h>
 
+class AbstractMail;
 /* a class to describe mails in a mailbox */
 /* Attention!
    From programmers point of view it would make sense to
@@ -32,7 +33,7 @@ class RecMail
 public:
     RecMail();
     RecMail(const RecMail&old);
-    virtual ~RecMail(){}
+    virtual ~RecMail();
 
     const int getNumber()const{return msg_number;}
     void setNumber(int number){msg_number=number;}
@@ -60,12 +61,16 @@ public:
     const QStringList&Bcc()const;
     const QBitArray&getFlags()const{return msg_flags;}
     void setFlags(const QBitArray&flags){msg_flags = flags;}
+    
+    void setWrapper(AbstractMail*wrapper);
+    AbstractMail* Wrapper();
 
 protected:
     QString subject,date,from,mbox,msg_id,replyto;
     int msg_number,msg_size;
     QBitArray msg_flags;
     QStringList to,cc,bcc;
+    AbstractMail*wrapper;
     void init();
     void copy_old(const RecMail&old);
 };
diff --git a/noncore/net/mail/pop3wrapper.cpp b/noncore/net/mail/pop3wrapper.cpp
index 49c3b7a..903ef4d 100644
--- a/noncore/net/mail/pop3wrapper.cpp
+++ b/noncore/net/mail/pop3wrapper.cpp
@@ -81,6 +81,7 @@ void POP3wrapper::listMessages(const QString &, QList<RecMail> &target )
         }
         RecMail *mail = parseHeader( header );
         mail->setNumber( info->msg_index );
+        mail->setWrapper(this);
         target.append( mail );
     }