1 files changed, 7 insertions, 6 deletions

diff --git a/noncore/net/mail/libmailwrapper/mboxwrapper.cpp b/noncore/net/mail/libmailwrapper/mboxwrapper.cpp
index 60f7507..3a0b30a 100644
--- a/noncore/net/mail/libmailwrapper/mboxwrapper.cpp
+++ b/noncore/net/mail/libmailwrapper/mboxwrapper.cpp
@@ -163,64 +163,65 @@ void MBOXwrapper::storeMessage(const char*msg,size_t length, const QString&folde
     int r = mailmbox_init(p.latin1(),0,1,0,&f);
     if (r != MAIL_NO_ERROR) {
         Global::statusMessage(tr("Error init folder"));
         return;
     }
     r = mailmbox_append_message(f,msg,length);
     if (r != MAIL_NO_ERROR) {
         Global::statusMessage(tr("Error writing to message folder"));
     }
     mailmbox_done(f);
 }
 
-void MBOXwrapper::fetchRawBody(const RecMail&mail,char**target,size_t*length)
+encodedString* MBOXwrapper::fetchRawBody(const RecMail&mail)
 {
     RecBody body;
     mailstorage*storage = mailstorage_new(NULL);
     QString p = MBOXPath+"/";
     p+=mail.getMbox();
     mailmessage * msg;
     char*data=0;
     size_t size;
 
     int r = mbox_mailstorage_init(storage,(char*)p.latin1(),0,0,0);
     mailfolder*folder;
     folder = mailfolder_new( storage,(char*)p.latin1(),NULL);   
     r = mailfolder_connect(folder);
     if (r != MAIL_NO_ERROR) {
         Global::statusMessage(tr("Error initializing mbox"));
         mailfolder_free(folder);
         mailstorage_free(storage);
-        return;
+        return 0;
     }
     r = mailsession_get_message(folder->fld_session, mail.getNumber(), &msg);
     if (r != MAIL_NO_ERROR) {
         Global::statusMessage(tr("Error fetching mail %i").arg(mail.getNumber()));
         mailfolder_free(folder);
         mailstorage_free(storage);
-        return;
+        return 0;
     }
     r = mailmessage_fetch(msg,&data,&size);
     if (r != MAIL_NO_ERROR) {
         Global::statusMessage(tr("Error fetching mail %i").arg(mail.getNumber()));
         mailfolder_free(folder);
         mailstorage_free(storage);
         mailmessage_free(msg);
-        return;
+        return 0;
     }
-    *target = data;
-    *length = size;
+    encodedString*result = new encodedString(data,size);
+
     mailfolder_free(folder);
     mailstorage_free(storage);
     mailmessage_free(msg);
+    return result;
 }
 
 void MBOXwrapper::deleteMails(const QString & mailbox,QList<RecMail> &target)
 {
     QString p = MBOXPath+"/";
     p+=mailbox;
     mailmbox_folder*f = 0;
     int r = mailmbox_init(p.latin1(),0,1,0,&f);
     if (r != MAIL_NO_ERROR) {
         qDebug("Error init folder");
         return;
     }