some (hopeful) improvements

23 files changed, 221 insertions, 187 deletions

diff --git a/noncore/net/mail/accountitem.cpp b/noncore/net/mail/accountitem.cpp
index e4bb6c5..54d2da2 100644
--- a/noncore/net/mail/accountitem.cpp
+++ b/noncore/net/mail/accountitem.cpp
@@ -76,7 +76,7 @@ void POP3viewItem::refresh()
     delete folders;
 }
 
-RecBody POP3viewItem::fetchBody( const RecMailP &mail )
+RECBODYP POP3viewItem::fetchBody( const RecMailP &mail )
 {
     qDebug( "POP3 fetchBody" );
     return wrapper->fetchBody( mail );
@@ -161,7 +161,7 @@ void POP3folderItem::refresh(QValueList<RecMailP>&target)
         pop3->getWrapper()->listMessages( folder->getName(),target );
 }
 
-RecBody POP3folderItem::fetchBody(const RecMailP&aMail)
+RECBODYP POP3folderItem::fetchBody(const RecMailP&aMail)
 {
     return pop3->getWrapper()->fetchBody(aMail);
 }
@@ -267,7 +267,7 @@ void NNTPviewItem::refresh()
     delete folders;
 }
 
-RecBody NNTPviewItem::fetchBody( const RecMailP &mail )
+RECBODYP NNTPviewItem::fetchBody( const RecMailP &mail )
 {
     qDebug( "NNTP fetchBody" );
     return wrapper->fetchBody( mail );
@@ -365,7 +365,7 @@ void NNTPfolderItem::refresh(QValueList<RecMailP>&target)
         nntp->getWrapper()->listMessages( folder->getName(),target );
 }
 
-RecBody NNTPfolderItem::fetchBody(const RecMailP&aMail)
+RECBODYP NNTPfolderItem::fetchBody(const RecMailP&aMail)
 {
     return nntp->getWrapper()->fetchBody(aMail);
 }
@@ -562,9 +562,9 @@ void IMAPviewItem::contextMenuSelected(int id)
     }
 }
 
-RecBody IMAPviewItem::fetchBody(const RecMailP&)
+RECBODYP IMAPviewItem::fetchBody(const RecMailP&)
 {
-    return RecBody();
+    return new RecBody();
 }
 
 bool IMAPviewItem::offline()
@@ -622,7 +622,7 @@ void IMAPfolderItem::refresh(QValueList<RecMailP>&target)
     }
 }
 
-RecBody IMAPfolderItem::fetchBody(const RecMailP&aMail)
+RECBODYP IMAPfolderItem::fetchBody(const RecMailP&aMail)
 {
     return imap->getWrapper()->fetchBody(aMail);
 }
@@ -800,7 +800,7 @@ void MHviewItem::refresh(bool force)
     delete folders;
 }
 
-RecBody MHviewItem::fetchBody( const RecMailP &mail )
+RECBODYP MHviewItem::fetchBody( const RecMailP &mail )
 {
     qDebug( "MH fetchBody" );
     return wrapper->fetchBody( mail );
@@ -921,7 +921,7 @@ void MHfolderItem::refresh(QValueList<RecMailP>&target)
         mbox->getWrapper()->listMessages( folder->getName(),target );
 }
 
-RecBody MHfolderItem::fetchBody(const RecMailP&aMail)
+RECBODYP MHfolderItem::fetchBody(const RecMailP&aMail)
 {
     return mbox->getWrapper()->fetchBody(aMail);
 }
diff --git a/noncore/net/mail/accountitem.h b/noncore/net/mail/accountitem.h
index 6cdb260..f125eeb 100644
--- a/noncore/net/mail/accountitem.h
+++ b/noncore/net/mail/accountitem.h
@@ -17,6 +17,8 @@ class IMAPaccount;
 class AbstractMail;
 class Folder;
 
+#define RECBODYP Opie::Core::OSmartPointer<RecBody>
+
 class AccountViewItem : public QListViewItem
 {
 
@@ -28,7 +30,7 @@ public:
 
     virtual ~AccountViewItem();
     virtual void refresh(QValueList<Opie::Core::OSmartPointer<RecMail> >&)=0;
-    virtual RecBody fetchBody(const Opie::Core::OSmartPointer<RecMail>&)=0;
+    virtual RECBODYP fetchBody(const Opie::Core::OSmartPointer<RecMail>&)=0;
     virtual QPopupMenu * getContextMenu(){return 0;};
     virtual void contextMenuSelected(int){}
     virtual AccountView*accountView();
@@ -52,7 +54,7 @@ public:
     POP3viewItem( POP3account *a, AccountView *parent );
     virtual ~POP3viewItem();
     virtual void refresh(QValueList<Opie::Core::OSmartPointer<RecMail> >&target );
-    virtual RecBody fetchBody( const Opie::Core::OSmartPointer<RecMail> &mail );
+    virtual RECBODYP fetchBody( const Opie::Core::OSmartPointer<RecMail> &mail );
     AbstractMail *getWrapper();
     virtual QPopupMenu * getContextMenu();
     virtual void contextMenuSelected(int);
@@ -72,7 +74,7 @@ public:
     POP3folderItem( const Opie::Core::OSmartPointer<Folder>&folder, POP3viewItem *parent , QListViewItem*after  );
     virtual ~POP3folderItem();
     virtual void refresh(QValueList<Opie::Core::OSmartPointer<RecMail> >&);
-    virtual RecBody fetchBody(const Opie::Core::OSmartPointer<RecMail>&);
+    virtual RECBODYP fetchBody(const Opie::Core::OSmartPointer<RecMail>&);
     virtual QPopupMenu * getContextMenu();
     virtual void contextMenuSelected(int);
 
@@ -89,7 +91,7 @@ public:
     NNTPviewItem( NNTPaccount *a, AccountView *parent );
     virtual ~NNTPviewItem();
     virtual void refresh(QValueList<Opie::Core::OSmartPointer<RecMail> >&target );
-    virtual RecBody fetchBody( const Opie::Core::OSmartPointer<RecMail> &mail );
+    virtual RECBODYP fetchBody( const Opie::Core::OSmartPointer<RecMail> &mail );
     AbstractMail *getWrapper();
     virtual QPopupMenu * getContextMenu();
     virtual void contextMenuSelected(int);
@@ -110,7 +112,7 @@ public:
     NNTPfolderItem(const Opie::Core::OSmartPointer<Folder>&folder, NNTPviewItem *parent , QListViewItem*after  );
     virtual ~NNTPfolderItem();
     virtual void refresh(QValueList<Opie::Core::OSmartPointer<RecMail> >&);
-    virtual RecBody fetchBody(const Opie::Core::OSmartPointer<RecMail>&);
+    virtual RECBODYP fetchBody(const Opie::Core::OSmartPointer<RecMail>&);
     virtual QPopupMenu * getContextMenu();
     virtual void contextMenuSelected(int);
 
@@ -128,7 +130,7 @@ public:
     IMAPviewItem( IMAPaccount *a, AccountView *parent );
     virtual ~IMAPviewItem();
     virtual void refresh(QValueList<Opie::Core::OSmartPointer<RecMail> >&);
-    virtual RecBody fetchBody(const Opie::Core::OSmartPointer<RecMail>&);
+    virtual RECBODYP fetchBody(const Opie::Core::OSmartPointer<RecMail>&);
     AbstractMail *getWrapper();
     virtual QPopupMenu * getContextMenu();
     virtual void contextMenuSelected(int);
@@ -151,7 +153,7 @@ public:
     IMAPfolderItem( const Opie::Core::OSmartPointer<Folder>&folder, IMAPfolderItem *parent , QListViewItem*after, IMAPviewItem *master  );
     virtual ~IMAPfolderItem();
     virtual void refresh(QValueList<Opie::Core::OSmartPointer<RecMail> >&);
-    virtual RecBody fetchBody(const Opie::Core::OSmartPointer<RecMail>&);
+    virtual RECBODYP fetchBody(const Opie::Core::OSmartPointer<RecMail>&);
     virtual QPopupMenu * getContextMenu();
     virtual void contextMenuSelected(int);
     virtual const QString& Delemiter()const;
@@ -170,7 +172,7 @@ public:
     MHviewItem( const QString&aMboxPath, AccountView *parent );
     virtual ~MHviewItem();
     virtual void refresh(QValueList<Opie::Core::OSmartPointer<RecMail> >&target );
-    virtual RecBody fetchBody( const Opie::Core::OSmartPointer<RecMail> &mail );
+    virtual RECBODYP fetchBody( const Opie::Core::OSmartPointer<RecMail> &mail );
     AbstractMail *getWrapper();
     virtual QPopupMenu * getContextMenu();
     virtual void contextMenuSelected(int);
@@ -193,7 +195,7 @@ public:
     MHfolderItem( const Opie::Core::OSmartPointer<Folder>&folder, MHfolderItem *parent, QListViewItem*after, MHviewItem*master);
     virtual ~MHfolderItem();
     virtual void refresh(QValueList<Opie::Core::OSmartPointer<RecMail> >&);
-    virtual RecBody fetchBody(const Opie::Core::OSmartPointer<RecMail>&);
+    virtual RECBODYP fetchBody(const Opie::Core::OSmartPointer<RecMail>&);
     virtual QPopupMenu * getContextMenu();
     virtual void contextMenuSelected(int);
     virtual const Opie::Core::OSmartPointer<Folder>&getFolder()const;
diff --git a/noncore/net/mail/accountview.cpp b/noncore/net/mail/accountview.cpp
index 811e57a..f0a163e 100644
--- a/noncore/net/mail/accountview.cpp
+++ b/noncore/net/mail/accountview.cpp
@@ -114,10 +114,10 @@ void AccountView::refreshAll()
 {
 }
 
-RecBody AccountView::fetchBody(const RecMailP&aMail)
+RecBodyP AccountView::fetchBody(const RecMailP&aMail)
 {
     QListViewItem*item = selectedItem ();
-    if (!item) return RecBody();
+    if (!item) return new RecBody();
     AccountViewItem *view = static_cast<AccountViewItem *>(item);
     return view->fetchBody(aMail);
 }
diff --git a/noncore/net/mail/accountview.h b/noncore/net/mail/accountview.h
index b082b1f..787b0b0 100644
--- a/noncore/net/mail/accountview.h
+++ b/noncore/net/mail/accountview.h
@@ -21,7 +21,7 @@ public:
     AccountView( QWidget *parent = 0, const char *name = 0, WFlags flags = 0 );
     virtual ~AccountView();
     virtual void populate( QList<Account> list );
-    virtual RecBody fetchBody(const Opie::Core::OSmartPointer<RecMail>&aMail);
+    virtual RecBodyP fetchBody(const Opie::Core::OSmartPointer<RecMail>&aMail);
     virtual void downloadMails(const Opie::Core::OSmartPointer<Folder>&fromFolder,AbstractMail*fromWrapper);
     virtual bool currentisDraft();
 
diff --git a/noncore/net/mail/composemail.cpp b/noncore/net/mail/composemail.cpp
index 5bc2883..988a1d9 100644
--- a/noncore/net/mail/composemail.cpp
+++ b/noncore/net/mail/composemail.cpp
@@ -280,7 +280,7 @@ ComposeMail::~ComposeMail()
 void ComposeMail::reEditMail(const RecMailP&current)
 {
     RecMailP data = current;
-    message->setText(data->Wrapper()->fetchBody(current).Bodytext());
+    message->setText(data->Wrapper()->fetchBody(current)->Bodytext());
     subjectLine->setText( data->getSubject());
     toLine->setText(data->To().join(","));
     ccLine->setText(data->CC().join(","));
diff --git a/noncore/net/mail/libmailwrapper/abstractmail.h b/noncore/net/mail/libmailwrapper/abstractmail.h
index 2d55c83..e5d64a6 100644
--- a/noncore/net/mail/libmailwrapper/abstractmail.h
+++ b/noncore/net/mail/libmailwrapper/abstractmail.h
@@ -24,10 +24,10 @@ public:
     virtual QValueList<Opie::Core::OSmartPointer<Folder> >* listFolders()=0;
     virtual void listMessages(const QString & mailbox,QValueList<RecMailP>&target )=0;
     virtual void statusFolder(folderStat&target_stat,const QString & mailbox="INBOX")=0;
-    virtual RecBody fetchBody(const RecMailP&mail)=0;
-    virtual QString fetchTextPart(const RecMailP&mail,const RecPart&part)=0;
-    virtual encodedString* fetchDecodedPart(const RecMailP&mail,const RecPart&part)=0;
-    virtual encodedString* fetchRawPart(const RecMailP&mail,const RecPart&part)=0;
+    virtual RecBodyP fetchBody(const RecMailP&mail)=0;
+    virtual QString fetchTextPart(const RecMailP&mail,const RecPartP&part)=0;
+    virtual encodedString* fetchDecodedPart(const RecMailP&mail,const RecPartP&part)=0;
+    virtual encodedString* fetchRawPart(const RecMailP&mail,const RecPartP&part)=0;
     virtual encodedString* fetchRawBody(const RecMailP&mail)=0;
 
     virtual void deleteMail(const RecMailP&mail)=0;
diff --git a/noncore/net/mail/libmailwrapper/genericwrapper.cpp b/noncore/net/mail/libmailwrapper/genericwrapper.cpp
index f428415..0c68280 100644
--- a/noncore/net/mail/libmailwrapper/genericwrapper.cpp
+++ b/noncore/net/mail/libmailwrapper/genericwrapper.cpp
@@ -22,7 +22,7 @@ Genericwrapper::~Genericwrapper()
     cleanMimeCache();
 }
 
-void Genericwrapper::fillSingleBody(RecPart&target,mailmessage*,mailmime*mime)
+void Genericwrapper::fillSingleBody(RecPartP&target,mailmessage*,mailmime*mime)
 {
     if (!mime) {
         return;
@@ -38,30 +38,30 @@ void Genericwrapper::fillSingleBody(RecPart&target,mailmessage*,mailmime*mime)
     mailmime_content*type = fields.fld_content;
     clistcell*current;
     if (!type) {
-        target.setType("text");
-        target.setSubtype("plain");
+        target->setType("text");
+        target->setSubtype("plain");
     } else {
-        target.setSubtype(type->ct_subtype);
+        target->setSubtype(type->ct_subtype);
         switch(type->ct_type->tp_data.tp_discrete_type->dt_type) {
         case MAILMIME_DISCRETE_TYPE_TEXT:
-            target.setType("text");
+            target->setType("text");
             break;
         case MAILMIME_DISCRETE_TYPE_IMAGE:
-            target.setType("image");
+            target->setType("image");
             break;
         case MAILMIME_DISCRETE_TYPE_AUDIO:
-            target.setType("audio");
+            target->setType("audio");
             break;
         case MAILMIME_DISCRETE_TYPE_VIDEO:
-            target.setType("video");
+            target->setType("video");
             break;
         case MAILMIME_DISCRETE_TYPE_APPLICATION:
-            target.setType("application");
+            target->setType("application");
             break;
         case MAILMIME_DISCRETE_TYPE_EXTENSION:
         default:
             if (type->ct_type->tp_data.tp_discrete_type->dt_extension) {
-                target.setType(type->ct_type->tp_data.tp_discrete_type->dt_extension);
+                target->setType(type->ct_type->tp_data.tp_discrete_type->dt_extension);
             }
             break;
         }
@@ -74,13 +74,13 @@ void Genericwrapper::fillSingleBody(RecPart&target,mailmessage*,mailmime*mime)
             field = (mailmime_field*)current->data;
             switch(field->fld_type) {
             case MAILMIME_FIELD_TRANSFER_ENCODING:
-                target.setEncoding(getencoding(field->fld_data.fld_encoding));
+                target->setEncoding(getencoding(field->fld_data.fld_encoding));
                 break;
             case MAILMIME_FIELD_ID:
-                target.setIdentifier(field->fld_data.fld_id);
+                target->setIdentifier(field->fld_data.fld_id);
                 break;
             case MAILMIME_FIELD_DESCRIPTION:
-                target.setDescription(field->fld_data.fld_description);
+                target->setDescription(field->fld_data.fld_description);
                 break;
             default:
                 break;
@@ -89,7 +89,7 @@ void Genericwrapper::fillSingleBody(RecPart&target,mailmessage*,mailmime*mime)
     }
 }
 
-void Genericwrapper::fillParameters(RecPart&target,clist*parameters)
+void Genericwrapper::fillParameters(RecPartP&target,clist*parameters)
 {
     if (!parameters) {return;}
     clistcell*current=0;
@@ -97,7 +97,7 @@ void Genericwrapper::fillParameters(RecPart&target,clist*parameters)
     for (current=clist_begin(parameters);current!=0;current=clist_next(current)) {
         param = (mailmime_parameter*)current->data;
         if (param) {
-            target.addParameter(QString(param->pa_name).lower(),QString(param->pa_value));
+            target->addParameter(QString(param->pa_name).lower(),QString(param->pa_value));
         }
     }
 }
@@ -132,7 +132,7 @@ QString Genericwrapper::getencoding(mailmime_mechanism*aEnc)
     return enc;
 }
 
-void Genericwrapper::traverseBody(RecBody&target,mailmessage*message,mailmime*mime,QValueList<int>recList,unsigned int current_rec,int current_count)
+void Genericwrapper::traverseBody(RecBodyP&target,mailmessage*message,mailmime*mime,QValueList<int>recList,unsigned int current_rec,int current_count)
 {
     if (current_rec >= 10) {
         qDebug("too deep recursion!");
@@ -145,7 +145,7 @@ void Genericwrapper::traverseBody(RecBody&target,mailmessage*message,mailmime*mi
     size_t len;
     clistiter * cur = 0;
     QString b;
-    RecPart part;
+    RecPartP part = new RecPart();
 
     switch (mime->mm_type) {
     case MAILMIME_SINGLE:
@@ -153,28 +153,28 @@ void Genericwrapper::traverseBody(RecBody&target,mailmessage*message,mailmime*mi
         QValueList<int>countlist = recList;
         countlist.append(current_count);
         r = mailmessage_fetch_section(message,mime,&data,&len);
-        part.setSize(len);
-        part.setPositionlist(countlist);
+        part->setSize(len);
+        part->setPositionlist(countlist);
         b = gen_attachment_id();
-        part.setIdentifier(b);
+        part->setIdentifier(b);
         fillSingleBody(part,message,mime);
-        if (part.Type()=="text" && target.Bodytext().isNull()) {
+        if (part->Type()=="text" && target->Bodytext().isNull()) {
             encodedString*rs = new encodedString();
             rs->setContent(data,len);
-            encodedString*res = decode_String(rs,part.Encoding());
+            encodedString*res = decode_String(rs,part->Encoding());
             if (countlist.count()>2) {
                 bodyCache[b]=rs;
-                target.addPart(part);
+                target->addPart(part);
             } else {
                 delete rs;
             }
             b = QString(res->Content());
             delete res;
-            target.setBodytext(b);
-            target.setDescription(part);
+            target->setBodytext(b);
+            target->setDescription(part);
         } else {
             bodyCache[b]=new encodedString(data,len);
-            target.addPart(part);
+            target->addPart(part);
         }
     }
     break;
@@ -186,11 +186,11 @@ void Genericwrapper::traverseBody(RecBody&target,mailmessage*message,mailmime*mi
         for (cur = clist_begin(mime->mm_data.mm_multipart.mm_mp_list) ; cur != NULL ; cur = clist_next(cur)) {
             cbody = (mailmime*)clist_content(cur);
             if (cbody->mm_type==MAILMIME_MULTIPLE) {
-                RecPart targetPart;
-                targetPart.setType("multipart");
+                RecPartP targetPart = new RecPart();
+                targetPart->setType("multipart");
                 countlist.append(current_count);
-                targetPart.setPositionlist(countlist);
-                target.addPart(targetPart);
+                targetPart->setPositionlist(countlist);
+                target->addPart(targetPart);
             }
             traverseBody(target,message, cbody,countlist,current_rec+1,ccount);
             if (cbody->mm_type==MAILMIME_MULTIPLE) {
@@ -206,16 +206,16 @@ void Genericwrapper::traverseBody(RecBody&target,mailmessage*message,mailmime*mi
         countlist.append(current_count);
         /* the own header is always at recursion 0 - we don't need that */
         if (current_rec > 0) {
-            part.setPositionlist(countlist);
+            part->setPositionlist(countlist);
             r = mailmessage_fetch_section(message,mime,&data,&len);
-            part.setSize(len);
-            part.setPositionlist(countlist);
+            part->setSize(len);
+            part->setPositionlist(countlist);
             b = gen_attachment_id();
-            part.setIdentifier(b);
-            part.setType("message");
-            part.setSubtype("rfc822");
+            part->setIdentifier(b);
+            part->setType("message");
+            part->setSubtype("rfc822");
             bodyCache[b]=new encodedString(data,len);
-            target.addPart(part);
+            target->addPart(part);
         }
         if (mime->mm_data.mm_message.mm_msg_mime != NULL) {
             traverseBody(target,message,mime->mm_data.mm_message.mm_msg_mime,countlist,current_rec+1);
@@ -225,13 +225,13 @@ void Genericwrapper::traverseBody(RecBody&target,mailmessage*message,mailmime*mi
     }
 }
 
-RecBody Genericwrapper::parseMail( mailmessage * msg )
+RecBodyP Genericwrapper::parseMail( mailmessage * msg )
 {
     int err = MAILIMF_NO_ERROR;
     mailmime_single_fields fields;
     /* is bound to msg and will be freed there */
     mailmime * mime=0;
-    RecBody body;
+    RecBodyP body = new RecBody();
     memset(&fields, 0, sizeof(struct mailmime_single_fields));
     err = mailmessage_get_bodystructure(msg,&mime);
     QValueList<int>recList;
@@ -332,23 +332,23 @@ QString Genericwrapper::parseMailboxList( mailimf_mailbox_list *list )
     return result;
 }
 
-encodedString* Genericwrapper::fetchDecodedPart(const RecMailP&,const RecPart&part)
+encodedString* Genericwrapper::fetchDecodedPart(const RecMailP&,const RecPartP&part)
 {
-    QMap<QString,encodedString*>::ConstIterator it = bodyCache.find(part.Identifier());
+    QMap<QString,encodedString*>::ConstIterator it = bodyCache.find(part->Identifier());
     if (it==bodyCache.end()) return new encodedString();
-    encodedString*t = decode_String(it.data(),part.Encoding());
+    encodedString*t = decode_String(it.data(),part->Encoding());
     return t;
 }
 
-encodedString* Genericwrapper::fetchRawPart(const RecMailP&mail,const RecPart&part)
+encodedString* Genericwrapper::fetchRawPart(const RecMailP&,const RecPartP&part)
 {
-    QMap<QString,encodedString*>::ConstIterator it = bodyCache.find(part.Identifier());
+    QMap<QString,encodedString*>::ConstIterator it = bodyCache.find(part->Identifier());
     if (it==bodyCache.end()) return new encodedString();
     encodedString*t = it.data();
     return t;
 }
 
-QString Genericwrapper::fetchTextPart(const RecMailP&mail,const RecPart&part)
+QString Genericwrapper::fetchTextPart(const RecMailP&mail,const RecPartP&part)
 {
     encodedString*t = fetchDecodedPart(mail,part);
     QString text=t->Content();
diff --git a/noncore/net/mail/libmailwrapper/genericwrapper.h b/noncore/net/mail/libmailwrapper/genericwrapper.h
index f5b9504..8be9212 100644
--- a/noncore/net/mail/libmailwrapper/genericwrapper.h
+++ b/noncore/net/mail/libmailwrapper/genericwrapper.h
@@ -34,25 +34,25 @@ public:
     Genericwrapper();
     virtual ~Genericwrapper();
 
-    virtual encodedString* fetchDecodedPart(const RecMailP&mail,const RecPart&part);
-    virtual encodedString* fetchRawPart(const RecMailP&mail,const RecPart&part);
-    virtual QString fetchTextPart(const RecMailP&mail,const RecPart&part);
+    virtual encodedString* fetchDecodedPart(const RecMailP&mail,const RecPartP&part);
+    virtual encodedString* fetchRawPart(const RecMailP&mail,const RecPartP&part);
+    virtual QString fetchTextPart(const RecMailP&mail,const RecPartP&part);
     virtual void cleanMimeCache();
     virtual int deleteMbox(const Opie::Core::OSmartPointer<Folder>&){return 1;}
     virtual void logout(){};
     virtual void storeMessage(const char*msg,size_t length, const QString&folder){};
 
 protected:
-    RecBody parseMail( mailmessage * msg );
+    RecBodyP parseMail( mailmessage * msg );
     QString parseMailboxList( mailimf_mailbox_list *list );
     QString parseMailbox( mailimf_mailbox *box );
     QString parseGroup( mailimf_group *group );
     QString parseAddressList( mailimf_address_list *list );
     QString parseDateTime( mailimf_date_time *date );
 
-    void traverseBody(RecBody&target,mailmessage*message,mailmime*mime,QValueList<int>recList,unsigned int current_rek=0,int current_count=1);
-    static void fillSingleBody(RecPart&target,mailmessage*message,mailmime*mime);
-    static void fillParameters(RecPart&target,clist*parameters);
+    void traverseBody(RecBodyP&target,mailmessage*message,mailmime*mime,QValueList<int>recList,unsigned int current_rek=0,int current_count=1);
+    static void fillSingleBody(RecPartP&target,mailmessage*message,mailmime*mime);
+    static void fillParameters(RecPartP&target,clist*parameters);
     static QString getencoding(mailmime_mechanism*aEnc);
     virtual void parseList(QValueList<Opie::Core::OSmartPointer<RecMail> > &target,mailsession*session,const QString&mailbox,bool mbox_as_to=false);
     QStringList parseInreplies(mailimf_in_reply_to * in_replies);
diff --git a/noncore/net/mail/libmailwrapper/imapwrapper.cpp b/noncore/net/mail/libmailwrapper/imapwrapper.cpp
index 56e7df9..230cf53 100644
--- a/noncore/net/mail/libmailwrapper/imapwrapper.cpp
+++ b/noncore/net/mail/libmailwrapper/imapwrapper.cpp
@@ -483,9 +483,9 @@ RecMail*IMAPwrapper::parse_list_result(mailimap_msg_att* m_att)
     return m;
 }
 
-RecBody IMAPwrapper::fetchBody(const RecMailP&mail)
+RecBodyP IMAPwrapper::fetchBody(const RecMailP&mail)
 {
-    RecBody body;
+    RecBodyP body = new RecBody();
     const char *mb;
     int err = MAILIMAP_NO_ERROR;
     clist *result = 0;
@@ -642,7 +642,7 @@ encodedString*IMAPwrapper::fetchRawPart(const RecMailP&mail,const QValueList<int
 
 /* current_recursion is for recursive calls.
    current_count means the position inside the internal loop! */
-void IMAPwrapper::traverseBody(const RecMailP&mail,mailimap_body*body,RecBody&target_body,
+void IMAPwrapper::traverseBody(const RecMailP&mail,mailimap_body*body,RecBodyP&target_body,
     int current_recursion,QValueList<int>recList,int current_count)
 {
     if (!body || current_recursion>=10) {
@@ -653,28 +653,28 @@ void IMAPwrapper::traverseBody(const RecMailP&mail,mailimap_body*body,RecBody&ta
     {
         QValueList<int>countlist = recList;
         countlist.append(current_count);
-        RecPart currentPart;
+        RecPartP currentPart = new RecPart();
         mailimap_body_type_1part*part1 = body->bd_data.bd_body_1part;
         QString id("");
-        currentPart.setPositionlist(countlist);
+        currentPart->setPositionlist(countlist);
         for (unsigned int j = 0; j < countlist.count();++j) {
             id+=(j>0?" ":"");
             id+=QString("%1").arg(countlist[j]);
         }
         qDebug("ID = %s",id.latin1());
-        currentPart.setIdentifier(id);
+        currentPart->setIdentifier(id);
         fillSinglePart(currentPart,part1);
         /* important: Check for is NULL 'cause a body can be empty!
            And we put it only into the mail if it is the FIRST part */
-        if (part1->bd_type==MAILIMAP_BODY_TYPE_1PART_TEXT && target_body.Bodytext().isNull() && countlist[0]==1) {
-            QString body_text = fetchTextPart(mail,countlist,true,currentPart.Encoding());
-            target_body.setDescription(currentPart);
-            target_body.setBodytext(body_text);
+        if (part1->bd_type==MAILIMAP_BODY_TYPE_1PART_TEXT && target_body->Bodytext().isNull() && countlist[0]==1) {
+            QString body_text = fetchTextPart(mail,countlist,true,currentPart->Encoding());
+            target_body->setDescription(currentPart);
+            target_body->setBodytext(body_text);
             if (countlist.count()>1) {
-                target_body.addPart(currentPart);
+                target_body->addPart(currentPart);
             }
         } else {
-            target_body.addPart(currentPart);
+            target_body->addPart(currentPart);
         }
         if (part1->bd_type==MAILIMAP_BODY_TYPE_1PART_MSG) {
             traverseBody(mail,part1->bd_data.bd_type_msg->bd_body,target_body,current_recursion+1,countlist);
@@ -691,12 +691,12 @@ void IMAPwrapper::traverseBody(const RecMailP&mail,mailimap_body*body,RecBody&ta
         for (current=clist_begin(mailDescription->bd_list);current!=0;current=clist_next(current)) {
             current_body = (mailimap_body*)current->data;
             if (current_body->bd_type==MAILIMAP_BODY_MPART) {
-                RecPart targetPart;
-                targetPart.setType("multipart");
+                RecPartP targetPart = new RecPart();
+                targetPart->setType("multipart");
                 fillMultiPart(targetPart,mailDescription);
                 countlist.append(current_count);
-                targetPart.setPositionlist(countlist);
-                target_body.addPart(targetPart);
+                targetPart->setPositionlist(countlist);
+                target_body->addPart(targetPart);
                 QString id("");
                 for (unsigned int j = 0; j < countlist.count();++j) {
                     id+=(j>0?" ":"");
@@ -717,21 +717,21 @@ void IMAPwrapper::traverseBody(const RecMailP&mail,mailimap_body*body,RecBody&ta
     }
 }
 
-void IMAPwrapper::fillSinglePart(RecPart&target_part,mailimap_body_type_1part*Description)
+void IMAPwrapper::fillSinglePart(RecPartP&target_part,mailimap_body_type_1part*Description)
 {
     if (!Description) {
         return;
     }
     switch (Description->bd_type) {
         case MAILIMAP_BODY_TYPE_1PART_TEXT:
-            target_part.setType("text");
+            target_part->setType("text");
             fillSingleTextPart(target_part,Description->bd_data.bd_type_text);
             break;
         case MAILIMAP_BODY_TYPE_1PART_BASIC:
             fillSingleBasicPart(target_part,Description->bd_data.bd_type_basic);
             break;
         case MAILIMAP_BODY_TYPE_1PART_MSG:
-            target_part.setType("message");
+            target_part->setType("message");
             fillSingleMsgPart(target_part,Description->bd_data.bd_type_msg);
             break;
         default:
@@ -739,7 +739,7 @@ void IMAPwrapper::fillSinglePart(RecPart&target_part,mailimap_body_type_1part*De
     }
 }
 
-void IMAPwrapper::fillSingleTextPart(RecPart&target_part,mailimap_body_type_text*which)
+void IMAPwrapper::fillSingleTextPart(RecPartP&target_part,mailimap_body_type_text*which)
 {
     if (!which) {
         return;
@@ -747,41 +747,41 @@ void IMAPwrapper::fillSingleTextPart(RecPart&target_part,mailimap_body_type_text
     QString sub;
     sub = which->bd_media_text;
     qDebug("Type= text/%s",which->bd_media_text);
-    target_part.setSubtype(sub.lower());
-    target_part.setLines(which->bd_lines);
+    target_part->setSubtype(sub.lower());
+    target_part->setLines(which->bd_lines);
     fillBodyFields(target_part,which->bd_fields);
 }
 
-void IMAPwrapper::fillSingleMsgPart(RecPart&target_part,mailimap_body_type_msg*which)
+void IMAPwrapper::fillSingleMsgPart(RecPartP&target_part,mailimap_body_type_msg*which)
 {
     if (!which) {
         return;
     }
-    target_part.setSubtype("rfc822");
+    target_part->setSubtype("rfc822");
     qDebug("Message part");
     /* we set this type to text/plain */
-    target_part.setLines(which->bd_lines);
+    target_part->setLines(which->bd_lines);
     fillBodyFields(target_part,which->bd_fields);
 }
 
-void IMAPwrapper::fillMultiPart(RecPart&target_part,mailimap_body_type_mpart*which)
+void IMAPwrapper::fillMultiPart(RecPartP&target_part,mailimap_body_type_mpart*which)
 {
     if (!which) return;
     QString sub = which->bd_media_subtype;
-    target_part.setSubtype(sub.lower());
+    target_part->setSubtype(sub.lower());
     if (which->bd_ext_mpart && which->bd_ext_mpart->bd_parameter && which->bd_ext_mpart->bd_parameter->pa_list) {
         clistcell*cur = 0;
         mailimap_single_body_fld_param*param=0;
         for (cur = clist_begin(which->bd_ext_mpart->bd_parameter->pa_list);cur!=NULL;cur=clist_next(cur)) {
             param = (mailimap_single_body_fld_param*)cur->data;
             if (param) {
-                target_part.addParameter(QString(param->pa_name).lower(),QString(param->pa_value));
+                target_part->addParameter(QString(param->pa_name).lower(),QString(param->pa_value));
             }
         }
     }
 }
 
-void IMAPwrapper::fillSingleBasicPart(RecPart&target_part,mailimap_body_type_basic*which)
+void IMAPwrapper::fillSingleBasicPart(RecPartP&target_part,mailimap_body_type_basic*which)
 {
     if (!which) {
         return;
@@ -818,12 +818,12 @@ void IMAPwrapper::fillSingleBasicPart(RecPart&target_part,mailimap_body_type_bas
         sub = "";
     }
     qDebug("Type = %s/%s",type.latin1(),sub.latin1());
-    target_part.setType(type.lower());
-    target_part.setSubtype(sub.lower());
+    target_part->setType(type.lower());
+    target_part->setSubtype(sub.lower());
     fillBodyFields(target_part,which->bd_fields);
 }
 
-void IMAPwrapper::fillBodyFields(RecPart&target_part,mailimap_body_fields*which)
+void IMAPwrapper::fillBodyFields(RecPartP&target_part,mailimap_body_fields*which)
 {
     if (!which) return;
     if (which->bd_parameter && which->bd_parameter->pa_list && which->bd_parameter->pa_list->count>0) {
@@ -832,7 +832,7 @@ void IMAPwrapper::fillBodyFields(RecPart&target_part,mailimap_body_fields*which)
         for (cur = clist_begin(which->bd_parameter->pa_list);cur!=NULL;cur=clist_next(cur)) {
             param = (mailimap_single_body_fld_param*)cur->data;
             if (param) {
-                target_part.addParameter(QString(param->pa_name).lower(),QString(param->pa_value));
+                target_part->addParameter(QString(param->pa_name).lower(),QString(param->pa_value));
             }
         }
     }
@@ -864,10 +864,10 @@ void IMAPwrapper::fillBodyFields(RecPart&target_part,mailimap_body_fields*which)
         }
     }
     if (which->bd_description) {
-        target_part.setDescription(QString(which->bd_description));
+        target_part->setDescription(QString(which->bd_description));
     }
-    target_part.setEncoding(encoding);
-    target_part.setSize(which->bd_size);
+    target_part->setEncoding(encoding);
+    target_part->setSize(which->bd_size);
 }
 
 void IMAPwrapper::deleteMail(const RecMailP&mail)
@@ -948,22 +948,22 @@ QString IMAPwrapper::fetchTextPart(const RecMailP&mail,const QValueList<int>&pat
     return body;
 }
 
-QString IMAPwrapper::fetchTextPart(const RecMailP&mail,const RecPart&part)
+QString IMAPwrapper::fetchTextPart(const RecMailP&mail,const RecPartP&part)
 {
-    return fetchTextPart(mail,part.Positionlist(),false,part.Encoding());
+    return fetchTextPart(mail,part->Positionlist(),false,part->Encoding());
 }
 
-encodedString* IMAPwrapper::fetchDecodedPart(const RecMailP&mail,const RecPart&part)
+encodedString* IMAPwrapper::fetchDecodedPart(const RecMailP&mail,const RecPartP&part)
 {
-    encodedString*res = fetchRawPart(mail,part.Positionlist(),false);
-    encodedString*r = decode_String(res,part.Encoding());
+    encodedString*res = fetchRawPart(mail,part->Positionlist(),false);
+    encodedString*r = decode_String(res,part->Encoding());
     delete res;
     return r;
 }
 
-encodedString* IMAPwrapper::fetchRawPart(const RecMailP&mail,const RecPart&part)
+encodedString* IMAPwrapper::fetchRawPart(const RecMailP&mail,const RecPartP&part)
 {
-    return fetchRawPart(mail,part.Positionlist(),false);
+    return fetchRawPart(mail,part->Positionlist(),false);
 }
 
 int IMAPwrapper::deleteAllMail(const FolderP&folder)
diff --git a/noncore/net/mail/libmailwrapper/imapwrapper.h b/noncore/net/mail/libmailwrapper/imapwrapper.h
index 7448acb..e56605a 100644
--- a/noncore/net/mail/libmailwrapper/imapwrapper.h
+++ b/noncore/net/mail/libmailwrapper/imapwrapper.h
@@ -35,10 +35,10 @@ public:
         const QString&targetFolder,AbstractMail*targetWrapper,bool moveit);
     virtual void mvcpMail(const RecMailP&mail,const QString&targetFolder,AbstractMail*targetWrapper,bool moveit);
 
-    virtual RecBody fetchBody(const RecMailP&mail);
-    virtual QString fetchTextPart(const RecMailP&mail,const RecPart&part);
-    virtual encodedString* fetchDecodedPart(const RecMailP&mail,const RecPart&part);
-    virtual encodedString* fetchRawPart(const RecMailP&mail,const RecPart&part);
+    virtual RecBodyP fetchBody(const RecMailP&mail);
+    virtual QString fetchTextPart(const RecMailP&mail,const RecPartP&part);
+    virtual encodedString* fetchDecodedPart(const RecMailP&mail,const RecPartP&part);
+    virtual encodedString* fetchRawPart(const RecMailP&mail,const RecPartP&part);
     virtual encodedString* fetchRawBody(const RecMailP&mail);
 
     virtual int createMbox(const QString&,const Opie::Core::OSmartPointer<Folder>&parentfolder=0,
@@ -60,15 +60,15 @@ protected:
     virtual encodedString*fetchRawPart(const RecMailP&mail,const QValueList<int>&path,bool internal_call);
     int selectMbox(const QString&mbox);
 
-    void fillSinglePart(RecPart&target_part,mailimap_body_type_1part*Description);
-    void fillSingleTextPart(RecPart&target_part,mailimap_body_type_text*which);
-    void fillSingleBasicPart(RecPart&target_part,mailimap_body_type_basic*which);
-    void fillSingleMsgPart(RecPart&target_part,mailimap_body_type_msg*which);
-    void fillMultiPart(RecPart&target_part,mailimap_body_type_mpart*which);
-    void traverseBody(const RecMailP&mail,mailimap_body*body,RecBody&target_body,int current_recursion,QValueList<int>recList,int current_count=1);
+    void fillSinglePart(RecPartP&target_part,mailimap_body_type_1part*Description);
+    void fillSingleTextPart(RecPartP&target_part,mailimap_body_type_text*which);
+    void fillSingleBasicPart(RecPartP&target_part,mailimap_body_type_basic*which);
+    void fillSingleMsgPart(RecPartP&target_part,mailimap_body_type_msg*which);
+    void fillMultiPart(RecPartP&target_part,mailimap_body_type_mpart*which);
+    void traverseBody(const RecMailP&mail,mailimap_body*body,RecBodyP&target_body,int current_recursion,QValueList<int>recList,int current_count=1);
 
     /* just helpers */
-    static void fillBodyFields(RecPart&target_part,mailimap_body_fields*which);
+    static void fillBodyFields(RecPartP&target_part,mailimap_body_fields*which);
     static QStringList address_list_to_stringlist(clist*list);
 
 
diff --git a/noncore/net/mail/libmailwrapper/mailtypes.cpp b/noncore/net/mail/libmailwrapper/mailtypes.cpp
index fd91fe5..90b8865 100644
--- a/noncore/net/mail/libmailwrapper/mailtypes.cpp
+++ b/noncore/net/mail/libmailwrapper/mailtypes.cpp
@@ -111,12 +111,29 @@ const QStringList& RecMail::References()const
 }
 
 RecPart::RecPart()
-    : m_type(""),m_subtype(""),m_identifier(""),m_encoding(""),m_description(""),m_lines(0),m_size(0)
+    : Opie::Core::ORefCount(),
+     m_type(""),m_subtype(""),m_identifier(""),m_encoding(""),m_description(""),m_lines(0),m_size(0)
 {
     m_Parameters.clear();
     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;
+    qDebug("RecPart copy constructor");
+}
+
 RecPart::~RecPart()
 {
 }
@@ -227,11 +244,20 @@ const QValueList<int>& RecPart::Positionlist()const
 }
 
 RecBody::RecBody()
-    : m_BodyText(),m_PartsList(),m_description()
+    : 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;
+    qDebug("Recbody copy constructor");
+}
+
 RecBody::~RecBody()
 {
 }
@@ -246,28 +272,28 @@ const QString& RecBody::Bodytext()const
     return m_BodyText;
 }
 
-void RecBody::setParts(const QValueList<RecPart>&parts)
+void RecBody::setParts(const QValueList<RecPartP>&parts)
 {
     m_PartsList.clear();
     m_PartsList = parts;
 }
 
-const QValueList<RecPart>& RecBody::Parts()const
+const QValueList<RecPartP>& RecBody::Parts()const
 {
     return m_PartsList;
 }
 
-void RecBody::addPart(const RecPart& part)
+void RecBody::addPart(const RecPartP& part)
 {
     m_PartsList.append(part);
 }
 
-void RecBody::setDescription(const RecPart&des)
+void RecBody::setDescription(const RecPartP&des)
 {
     m_description = des;
 }
 
-const RecPart& RecBody::Description()const
+const RecPartP& RecBody::Description()const
 {
     return m_description;
 }
diff --git a/noncore/net/mail/libmailwrapper/mailtypes.h b/noncore/net/mail/libmailwrapper/mailtypes.h
index 941556a..c317880 100644
--- a/noncore/net/mail/libmailwrapper/mailtypes.h
+++ b/noncore/net/mail/libmailwrapper/mailtypes.h
@@ -84,7 +84,7 @@ protected:
 typedef Opie::Core::OSmartPointer<RecMail> RecMailP;
 typedef QMap<QString,QString> part_plist_t;
 
-class RecPart
+class RecPart:public Opie::Core::ORefCount
 {
 protected:
     QString m_type,m_subtype,m_identifier,m_encoding,m_description;
@@ -95,6 +95,7 @@ protected:
 
 public:
     RecPart();
+    RecPart(const RecPart&);
     virtual ~RecPart();
 
     const QString&Type()const;
@@ -121,27 +122,32 @@ public:
     const QValueList<int>& Positionlist()const;
 };
 
-class RecBody
+typedef Opie::Core::OSmartPointer<RecPart> RecPartP;
+
+class RecBody:public Opie::Core::ORefCount
 {
 protected:
     QString m_BodyText;
-    QValueList<RecPart> m_PartsList;
-    RecPart m_description;
+    QValueList<RecPartP> m_PartsList;
+    RecPartP m_description;
 
 public:
     RecBody();
+    RecBody(const RecBody&old);
     virtual ~RecBody();
     void setBodytext(const QString&);
     const QString& Bodytext()const;
 
-    void setDescription(const RecPart&des);
-    const RecPart& Description()const;
+    void setDescription(const RecPartP&des);
+    const RecPartP& Description()const;
 
-    void setParts(const QValueList<RecPart>&parts);
-    const QValueList<RecPart>& Parts()const;
-    void addPart(const RecPart&part);
+    void setParts(const QValueList<RecPartP>&parts);
+    const QValueList<RecPartP>& Parts()const;
+    void addPart(const RecPartP&part);
 };
 
+typedef Opie::Core::OSmartPointer<RecBody> RecBodyP;
+
 class encodedString
 {
 public:
diff --git a/noncore/net/mail/libmailwrapper/mboxwrapper.cpp b/noncore/net/mail/libmailwrapper/mboxwrapper.cpp
index 4aee0be..e3c75f3 100644
--- a/noncore/net/mail/libmailwrapper/mboxwrapper.cpp
+++ b/noncore/net/mail/libmailwrapper/mboxwrapper.cpp
@@ -87,9 +87,9 @@ void MBOXwrapper::answeredMail(const RecMailP&)
 {
 }
 
-RecBody MBOXwrapper::fetchBody( const RecMailP &mail )
+RecBodyP MBOXwrapper::fetchBody( const RecMailP &mail )
 {
-    RecBody body;
+    RecBodyP body = new RecBody();
     mailstorage*storage = mailstorage_new(NULL);
     QString p = MBOXPath+"/";
     p+=mail->getMbox();
diff --git a/noncore/net/mail/libmailwrapper/mboxwrapper.h b/noncore/net/mail/libmailwrapper/mboxwrapper.h
index a2ecfee..9731b85 100644
--- a/noncore/net/mail/libmailwrapper/mboxwrapper.h
+++ b/noncore/net/mail/libmailwrapper/mboxwrapper.h
@@ -28,7 +28,7 @@ public:
 
     virtual void storeMessage(const char*msg,size_t length, const QString&folder);
 
-    virtual RecBody fetchBody( const RecMailP &mail );
+    virtual RecBodyP fetchBody( const RecMailP &mail );
     static void mbox_progress( size_t current, size_t maximum );
 
     virtual encodedString* fetchRawBody(const RecMailP&mail);
diff --git a/noncore/net/mail/libmailwrapper/mhwrapper.cpp b/noncore/net/mail/libmailwrapper/mhwrapper.cpp
index 5eae31f..12472e9 100644
--- a/noncore/net/mail/libmailwrapper/mhwrapper.cpp
+++ b/noncore/net/mail/libmailwrapper/mhwrapper.cpp
@@ -123,9 +123,9 @@ void MHwrapper::answeredMail(const RecMailP&)
 {
 }
 
-RecBody MHwrapper::fetchBody( const RecMailP &mail )
+RecBodyP MHwrapper::fetchBody( const RecMailP &mail )
 {
-    RecBody body;
+    RecBodyP body = new RecBody();
     init_storage();
     if (!m_storage) {
         return body;
diff --git a/noncore/net/mail/libmailwrapper/mhwrapper.h b/noncore/net/mail/libmailwrapper/mhwrapper.h
index 0846ec3..4310c84 100644
--- a/noncore/net/mail/libmailwrapper/mhwrapper.h
+++ b/noncore/net/mail/libmailwrapper/mhwrapper.h
@@ -33,7 +33,7 @@ public:
 
     virtual void storeMessage(const char*msg,size_t length, const QString&folder);
 
-    virtual RecBody fetchBody( const RecMailP &mail );
+    virtual RecBodyP fetchBody( const RecMailP &mail );
     static void mbox_progress( size_t current, size_t maximum );
 
     virtual encodedString* fetchRawBody(const RecMailP&mail);
diff --git a/noncore/net/mail/libmailwrapper/nntpwrapper.cpp b/noncore/net/mail/libmailwrapper/nntpwrapper.cpp
index 9de958d..cc36f32 100644
--- a/noncore/net/mail/libmailwrapper/nntpwrapper.cpp
+++ b/noncore/net/mail/libmailwrapper/nntpwrapper.cpp
@@ -33,17 +33,17 @@ void NNTPwrapper::nntp_progress( size_t current, size_t maximum ) {
 }
 
 
-RecBody NNTPwrapper::fetchBody( const RecMailP &mail ) {
+RecBodyP NNTPwrapper::fetchBody( const RecMailP &mail ) {
     int err = NEWSNNTP_NO_ERROR;
     char *message = 0;
     size_t length = 0;
 
+    RecBodyP body = new RecBody();
     login();
     if ( !m_nntp ) {
-        return RecBody();
+        return body;
     }
 
-    RecBody body;
     mailmessage * mailmsg;
     if (mail->Msgsize()>HARD_MSG_SIZE_LIMIT) {
         qDebug("Message to large: %i",mail->Msgsize());
diff --git a/noncore/net/mail/libmailwrapper/nntpwrapper.h b/noncore/net/mail/libmailwrapper/nntpwrapper.h
index a87a8e8..2fb82f2 100644
--- a/noncore/net/mail/libmailwrapper/nntpwrapper.h
+++ b/noncore/net/mail/libmailwrapper/nntpwrapper.h
@@ -30,7 +30,7 @@ public:
     virtual void answeredMail(const RecMailP&mail);
     virtual int deleteAllMail(const Opie::Core::OSmartPointer<Folder>&);
 
-    virtual RecBody fetchBody( const RecMailP &mail );
+    virtual RecBodyP fetchBody( const RecMailP &mail );
     virtual encodedString* fetchRawBody(const RecMailP&mail);
     virtual void logout();
     virtual MAILLIB::ATYPE getType()const;
diff --git a/noncore/net/mail/libmailwrapper/pop3wrapper.cpp b/noncore/net/mail/libmailwrapper/pop3wrapper.cpp
index f5694fe..1b7a1b4 100644
--- a/noncore/net/mail/libmailwrapper/pop3wrapper.cpp
+++ b/noncore/net/mail/libmailwrapper/pop3wrapper.cpp
@@ -31,17 +31,18 @@ void POP3wrapper::pop3_progress( size_t current, size_t maximum ) {
     qDebug( "POP3: %i of %i", current, maximum );
 }
 
-RecBody POP3wrapper::fetchBody( const RecMailP &mail ) {
+RecBodyP POP3wrapper::fetchBody( const RecMailP &mail ) {
     int err = MAILPOP3_NO_ERROR;
     char *message = 0;
     size_t length = 0;
 
+    RecBodyP body = new RecBody();
+
     login();
     if ( !m_pop3 ) {
-        return RecBody();
+        return body;
     }
 
-    RecBody body;
     mailmessage * mailmsg;
     if (mail->Msgsize()>HARD_MSG_SIZE_LIMIT) {
         qDebug("Message to large: %i",mail->Msgsize());
diff --git a/noncore/net/mail/libmailwrapper/pop3wrapper.h b/noncore/net/mail/libmailwrapper/pop3wrapper.h
index c46b941..5101fa5 100644
--- a/noncore/net/mail/libmailwrapper/pop3wrapper.h
+++ b/noncore/net/mail/libmailwrapper/pop3wrapper.h
@@ -26,7 +26,7 @@ public:
     virtual void answeredMail(const RecMailP&mail);
     virtual int deleteAllMail(const Opie::Core::OSmartPointer<Folder>&);
 
-    virtual RecBody fetchBody( const RecMailP &mail );
+    virtual RecBodyP fetchBody( const RecMailP &mail );
     virtual encodedString* fetchRawBody(const RecMailP&mail);
     virtual void logout();
     virtual MAILLIB::ATYPE getType()const;
diff --git a/noncore/net/mail/opiemail.cpp b/noncore/net/mail/opiemail.cpp
index dd305df..5da2161 100644
--- a/noncore/net/mail/opiemail.cpp
+++ b/noncore/net/mail/opiemail.cpp
@@ -146,7 +146,7 @@ void OpieMail::displayMail()
     QListViewItem*item = mailView->currentItem();
     if (!item) return;
     RecMailP mail = ((MailListViewItem*)item)->data();
-    RecBody body = folderView->fetchBody(mail);
+    RecBodyP body = folderView->fetchBody(mail);
     ViewMail readMail( this,"", Qt::WType_Modal | WStyle_ContextHelp  );
     readMail.setBody( body );
     readMail.setMail( mail );
diff --git a/noncore/net/mail/viewmail.cpp b/noncore/net/mail/viewmail.cpp
index f00d2cb..156e11d 100644
--- a/noncore/net/mail/viewmail.cpp
+++ b/noncore/net/mail/viewmail.cpp
@@ -78,22 +78,22 @@ AttachItem* ViewMail::lastChild(AttachItem*parent)
     return item;
 }
 
-void ViewMail::setBody( RecBody body )
+void ViewMail::setBody(const RecBodyP&body )
 {
 
     m_body = body;
-    m_mail[2] = body.Bodytext();
-    attachbutton->setEnabled(body.Parts().count()>0);
-    attachments->setEnabled(body.Parts().count()>0);
-    if (body.Parts().count()==0)
+    m_mail[2] = body->Bodytext();
+    attachbutton->setEnabled(body->Parts().count()>0);
+    attachments->setEnabled(body->Parts().count()>0);
+    if (body->Parts().count()==0)
     {
         return;
     }
     AttachItem * curItem=0;
     AttachItem * parentItem = 0;
-    QString type=body.Description().Type()+"/"+body.Description().Subtype();
+    QString type=body->Description()->Type()+"/"+body->Description()->Subtype();
     QString desc,fsize;
-    double s = body.Description().Size();
+    double s = body->Description()->Size();
     int w;
     w=0;
 
@@ -129,15 +129,15 @@ void ViewMail::setBody( RecBody body )
         o << s << " " << q << "Byte";
     }
 
-    curItem=new AttachItem(attachments,curItem,type,"Mailbody","",fsize,-1,body.Description().Positionlist());
+    curItem=new AttachItem(attachments,curItem,type,"Mailbody","",fsize,-1,body->Description()->Positionlist());
     QString filename = "";
 
-    for (unsigned int i = 0; i < body.Parts().count();++i)
+    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)
+        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)
         {
             qDebug(it.key());
             if (it.key().lower()=="name")
@@ -145,7 +145,7 @@ void ViewMail::setBody( RecBody body )
                 filename=it.data();
             }
         }
-        s = body.Parts()[i].Size();
+        s = body->Parts()[i]->Size();
         w = 0;
         while (s>1024)
         {
@@ -169,19 +169,19 @@ void ViewMail::setBody( RecBody body )
         if (w>0) o.precision(2); else o.precision(0);
         o.setf(QTextStream::fixed);
         o << s << " " << q << "Byte";
-        desc = body.Parts()[i].Description();
-        parentItem = searchParent(body.Parts()[i].Positionlist());
+        desc = body->Parts()[i]->Description();
+        parentItem = searchParent(body->Parts()[i]->Positionlist());
         if (parentItem)
         {
             AttachItem*temp = lastChild(parentItem);
             if (temp) curItem = temp;
-            curItem=new AttachItem(parentItem,curItem,type,desc,filename,fsize,i,body.Parts()[i].Positionlist());
+            curItem=new AttachItem(parentItem,curItem,type,desc,filename,fsize,i,body->Parts()[i]->Positionlist());
             attachments->setRootIsDecorated(true);
             curItem = parentItem;
         }
         else
         {
-            curItem=new AttachItem(attachments,curItem,type,desc,filename,fsize,i,body.Parts()[i].Positionlist());
+            curItem=new AttachItem(attachments,curItem,type,desc,filename,fsize,i,body->Parts()[i]->Positionlist());
         }
     }
 }
@@ -226,7 +226,7 @@ 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() ] );
+                encodedString*content = m_recMail->Wrapper()->fetchDecodedPart( m_recMail, m_body->Parts()[ ( ( AttachItem* )item )->Partnumber() ] );
                 if (content)
                 {
                     QFile output(str);
@@ -248,7 +248,7 @@ void ViewMail::slotItemClicked( QListViewItem * item , const QPoint & point, int
         {
             if (  m_recMail->Wrapper() != 0l )
             { // make sure that there is a wrapper , even after delete or simular actions
-                browser->setText( m_recMail->Wrapper()->fetchTextPart( m_recMail, m_body.Parts()[ ( ( AttachItem* )item )->Partnumber() ] ) );
+                browser->setText( m_recMail->Wrapper()->fetchTextPart( m_recMail, m_body->Parts()[ ( ( AttachItem* )item )->Partnumber() ] ) );
             }
         }
         break;
@@ -257,7 +257,7 @@ void ViewMail::slotItemClicked( QListViewItem * item , const QPoint & point, int
 }
 
 
-void ViewMail::setMail( RecMailP mail )
+void ViewMail::setMail(const RecMailP&mail )
 {
 
     m_recMail = mail;
diff --git a/noncore/net/mail/viewmail.h b/noncore/net/mail/viewmail.h
index 6875e3c..b60fb8e 100644
--- a/noncore/net/mail/viewmail.h
+++ b/noncore/net/mail/viewmail.h
@@ -36,8 +36,8 @@ public:
 
     void hide();
     void exec();
-        void setMail( RecMailP mail );
-        void setBody( RecBody body );
+    void setMail(const RecMailP&mail );
+    void setBody(const RecBodyP&body);
         bool deleted;
 
 protected:
@@ -59,7 +59,7 @@ private:
     bool _inLoop;
     QString m_mailHtml;
     bool m_gotBody;
-        RecBody m_body;
+    RecBodyP m_body;
         RecMailP m_recMail;
     bool m_showHtml;
 
@@ -67,7 +67,6 @@ private:
         QMap <int,QString>  m_mail;
         // 0 to 1 cc 2 bcc
         QMap <int,QStringList> m_mail2;
-
 };
 
 #endif