3 files changed, 18 insertions, 3 deletions
diff --git a/noncore/net/mail/libmailwrapper/imapwrapper.cpp b/noncore/net/mail/libmailwrapper/imapwrapper.cpp
index 0ce2c6c..ad95384 100644
--- a/noncore/net/mail/libmailwrapper/imapwrapper.cpp
+++ b/noncore/net/mail/libmailwrapper/imapwrapper.cpp
@@ -693,12 +693,15 @@ void IMAPwrapper::fillBodyFields(RecPart&target_part,mailimap_body_fields*which)
             char*t=enc->enc_value;
             encoding=QString(enc->enc_value);
             enc->enc_value=0L;
             free(t);
         }
     }
+    if (which->bd_description) {
+        target_part.setDescription(QString(which->bd_description));
+    }
     target_part.setEncoding(encoding);
     target_part.setSize(which->bd_size);
 }
 
 QString IMAPwrapper::fetchPart(const RecMail&mail,const RecPart&part)
 {
@@ -757,13 +760,13 @@ void IMAPwrapper::answeredMail(const RecMail&mail)
     if ( err != MAILIMAP_NO_ERROR ) {
         qDebug("error selecting mailbox for mark: %s",m_imap->imap_response);
         return;
     }
     flist = mailimap_flag_list_new_empty();
     mailimap_flag_list_add(flist,mailimap_flag_new_answered());
-    store_flags = mailimap_store_att_flags_new_set_flags(flist);
+    store_flags = mailimap_store_att_flags_new_add_flags(flist);
     set = mailimap_set_new_single(mail.getNumber());
     err = mailimap_store(m_imap,set,store_flags);
     mailimap_set_free( set );
     mailimap_store_att_flags_free(store_flags);
 
     if (err != MAILIMAP_NO_ERROR) {
diff --git a/noncore/net/mail/libmailwrapper/mailtypes.cpp b/noncore/net/mail/libmailwrapper/mailtypes.cpp
index 94f5d6f..8d9b247 100644
--- a/noncore/net/mail/libmailwrapper/mailtypes.cpp
+++ b/noncore/net/mail/libmailwrapper/mailtypes.cpp
@@ -82,13 +82,13 @@ void RecMail::setBcc(const QStringList&list)
 const QStringList& RecMail::Bcc()const
 {
     return bcc;
 }
 
 RecPart::RecPart()
-    : m_type(""),m_subtype(""),m_identifier(""),m_encoding(""),m_lines(0),m_size(0)
+    : m_type(""),m_subtype(""),m_identifier(""),m_encoding(""),m_description(""),m_lines(0),m_size(0)
 {
     m_Parameters.clear();
     m_poslist.clear();
 }
 
 RecPart::~RecPart()
@@ -152,12 +152,22 @@ const QString& RecPart::Encoding()const
 
 void RecPart::setEncoding(const QString&encoding)
 {
     m_encoding = encoding;
 }
 
+const QString& RecPart::Description()const
+{
+    return m_description;
+}
+
+void RecPart::setDescription(const QString&desc)
+{
+    m_description = desc;
+}
+    
 void RecPart::setParameters(const part_plist_t&list)
 {
     m_Parameters = list;
 }
 
 const part_plist_t& RecPart::Parameters()const
diff --git a/noncore/net/mail/libmailwrapper/mailtypes.h b/noncore/net/mail/libmailwrapper/mailtypes.h
index 9ef762d..7d7bebc 100644
--- a/noncore/net/mail/libmailwrapper/mailtypes.h
+++ b/noncore/net/mail/libmailwrapper/mailtypes.h
@@ -77,13 +77,13 @@ protected:
 
 typedef QMap<QString,QString> part_plist_t;
 
 class RecPart
 {
 protected:
-    QString m_type,m_subtype,m_identifier,m_encoding;
+    QString m_type,m_subtype,m_identifier,m_encoding,m_description;
     unsigned int m_lines,m_size;
     part_plist_t m_Parameters;
     /* describes the position in the mail */
     QValueList<int> m_poslist;
 
 public:
@@ -95,12 +95,14 @@ public:
     const QString&Subtype()const;
     void setSubtype(const QString&subtype);
     const QString&Identifier()const;
     void setIdentifier(const QString&identifier);
     const QString&Encoding()const;
     void setEncoding(const QString&encoding);
+    const QString&Description()const;
+    void setDescription(const QString&desc);
     void setLines(unsigned int lines);
     const unsigned int Lines()const;
     void setSize(unsigned int size);
     const unsigned int Size()const;