-answered mails get another pic (checked in in pics/opiemail)

-if a description for an attachment exists it will displayed
-if mailbody is selected from list of attachments it will displayd without
 menu

10 files changed, 64 insertions, 22 deletions

diff --git a/noncore/net/mail/imapwrapper.cpp b/noncore/net/mail/imapwrapper.cpp
index 0ce2c6c..ad95384 100644
--- a/noncore/net/mail/imapwrapper.cpp
+++ b/noncore/net/mail/imapwrapper.cpp
@@ -1,773 +1,776 @@
 
 #include <stdlib.h>
 
 #include "imapwrapper.h"
 #include "mailtypes.h"
 #include <libetpan/mailimap.h>
 
 IMAPwrapper::IMAPwrapper( IMAPaccount *a )
     : AbstractMail()
 {
     account = a;
     m_imap = 0;
 }
 
 IMAPwrapper::~IMAPwrapper()
 {
     logout();
 }
 
 void IMAPwrapper::imap_progress( size_t current, size_t maximum )
 {
     qDebug( "IMAP: %i of %i", current, maximum );
 }
 
 void IMAPwrapper::login()
 {
     const char *server, *user, *pass;
     uint16_t port;
     int err = MAILIMAP_NO_ERROR;
 
     /* we are connected this moment */
     /* TODO: setup a timer holding the line or if connection closed - delete the value */
     if (m_imap) {
         mailstream_flush(m_imap->imap_stream);
         return;
     }
     server = account->getServer().latin1();
     port = account->getPort().toUInt();
     user = account->getUser().latin1();
     pass = account->getPassword().latin1();
 
     m_imap = mailimap_new( 20, &imap_progress );
     /* connect */
     if (account->getSSL()) {
         err = mailimap_ssl_connect( m_imap, (char*)server, port );
     } else {
         err = mailimap_socket_connect( m_imap, (char*)server, port );
     }
 
     if ( err != MAILIMAP_NO_ERROR &&
          err != MAILIMAP_NO_ERROR_AUTHENTICATED &&
          err != MAILIMAP_NO_ERROR_NON_AUTHENTICATED ) {
          qDebug("error connecting server: %s",m_imap->imap_response);
          mailimap_free( m_imap );
          m_imap = 0;
          return;
     }
 
     /* login */
     err = mailimap_login_simple( m_imap, (char*)user, (char*)pass );
     if ( err != MAILIMAP_NO_ERROR ) {
         qDebug("error logging in imap: %s",m_imap->imap_response);
         err = mailimap_close( m_imap );
         mailimap_free( m_imap );
         m_imap = 0;
     }
 }
 
 void IMAPwrapper::logout()
 {
     int err = MAILIMAP_NO_ERROR;
     if (!m_imap) return;
     err = mailimap_logout( m_imap );
     err = mailimap_close( m_imap );
     mailimap_free( m_imap );
     m_imap = 0;
 }
 
 void IMAPwrapper::listMessages(const QString&mailbox,QList<RecMail> &target )
 {
     const char *mb;
     int err = MAILIMAP_NO_ERROR;
     clist *result;
     clistcell *current;
 //    mailimap_fetch_att *fetchAtt,*fetchAttFlags,*fetchAttDate,*fetchAttSize;
     mailimap_fetch_type *fetchType;
     mailimap_set *set;
 
     mb = mailbox.latin1();
     login();
     if (!m_imap) {
         return;
     }
     /* select mailbox READONLY for operations */
     err = mailimap_examine( m_imap, (char*)mb);
     if ( err != MAILIMAP_NO_ERROR ) {
         qDebug("error selecting mailbox: %s",m_imap->imap_response);
         return;
     }
 
     int last = m_imap->imap_selection_info->sel_exists;
 
     if (last == 0) {
         qDebug("mailbox has no mails");
         return;
     }
 
     result = clist_new();
     /* the range has to start at 1!!! not with 0!!!! */
     set = mailimap_set_new_interval( 1, last );
     fetchType = mailimap_fetch_type_new_fetch_att_list_empty();
     mailimap_fetch_type_new_fetch_att_list_add(fetchType,mailimap_fetch_att_new_envelope());
     mailimap_fetch_type_new_fetch_att_list_add(fetchType,mailimap_fetch_att_new_flags());
     mailimap_fetch_type_new_fetch_att_list_add(fetchType,mailimap_fetch_att_new_internaldate());
     mailimap_fetch_type_new_fetch_att_list_add(fetchType,mailimap_fetch_att_new_rfc822_size());
 
     err = mailimap_fetch( m_imap, set, fetchType, &result );
     mailimap_set_free( set );
     mailimap_fetch_type_free( fetchType );
 
     QString date,subject,from;
 
     if ( err == MAILIMAP_NO_ERROR ) {
         
         mailimap_msg_att * msg_att;
         int i = 0;
         for (current = clist_begin(result); current != 0; current=clist_next(current)) {
             ++i;
             msg_att = (mailimap_msg_att*)current->data;
             RecMail*m = parse_list_result(msg_att);
             if (m) {
                 m->setNumber(i);
                 m->setMbox(mailbox);
                 m->setWrapper(this);
                 target.append(m);
             }
         }
     } else {
         qDebug("Error fetching headers: %s",m_imap->imap_response);
     }
     mailimap_fetch_list_free(result);
 }
 
 QList<Folder>* IMAPwrapper::listFolders()
 {
     const char *path, *mask;
     int err = MAILIMAP_NO_ERROR;
     clist *result;
     clistcell *current;
 
     QList<Folder> * folders = new QList<Folder>();
     folders->setAutoDelete( false );
     login();
     if (!m_imap) {
         return folders;
     }
 
 /*
  * First we have to check for INBOX 'cause it sometimes it's not inside the path.
  * We must not forget to filter them out in next loop!
  * it seems like ugly code. and yes - it is ugly code. but the best way.
  */
     QString temp;
     mask = "INBOX" ;
     result = clist_new();
     mailimap_mailbox_list *list;
     err = mailimap_list( m_imap, (char*)"", (char*)mask, &result );
     if ( err == MAILIMAP_NO_ERROR ) {
         current = result->first;
         for ( int i = result->count; i > 0; i-- ) {
             list = (mailimap_mailbox_list *) current->data;
             // it is better use the deep copy mechanism of qt itself
             // instead of using strdup!
             temp = list->mb_name;
             folders->append( new IMAPFolder(temp));
             current = current->next;
         }
     } else {
         qDebug("error fetching folders: %s",m_imap->imap_response);
     }
     mailimap_list_result_free( result );
 
 /*
  * second stage - get the other then inbox folders
  */
     mask = "*" ;
     path = account->getPrefix().latin1();
     if (!path) path = "";
     result = clist_new();
     qDebug(path);
     bool selectable = true;
     mailimap_mbx_list_flags*bflags;
     err = mailimap_list( m_imap, (char*)path, (char*)mask, &result );
     if ( err == MAILIMAP_NO_ERROR ) {
         current = result->first;
         for ( current=clist_begin(result);current!=NULL;current=clist_next(current)) {
             list = (mailimap_mailbox_list *) current->data;
             // it is better use the deep copy mechanism of qt itself
             // instead of using strdup!
             temp = list->mb_name;
             if (temp.lower()=="inbox")
                 continue;
             if (temp.lower()==account->getPrefix().lower())
                 continue;
             if ( (bflags = list->mb_flag) ) {
                 selectable = !(bflags->mbf_type==MAILIMAP_MBX_LIST_FLAGS_SFLAG&&
                             bflags->mbf_sflag==MAILIMAP_MBX_LIST_SFLAG_NOSELECT);
             }
             folders->append(new IMAPFolder(temp,selectable,account->getPrefix()));
         }
     } else {
         qDebug("error fetching folders %s",m_imap->imap_response);
     }
     mailimap_list_result_free( result );
     return folders;
 }
 
 RecMail*IMAPwrapper::parse_list_result(mailimap_msg_att* m_att)
 {
     RecMail * m = 0;
     mailimap_msg_att_item *item=0;
     clistcell *current,*c,*cf;
     mailimap_msg_att_dynamic*flist;
     mailimap_flag_fetch*cflag;
     int size;
     QBitArray mFlags(7);
     QStringList addresslist;
 
     if (!m_att) {
         return m;
     }
     m = new RecMail();
     for (c = clist_begin(m_att->att_list); c!=NULL;c=clist_next(c) ) {
         current = c;
         size = 0;
         item = (mailimap_msg_att_item*)current->data;
         if (item->att_type!=MAILIMAP_MSG_ATT_ITEM_STATIC) {
             flist = (mailimap_msg_att_dynamic*)item->att_data.att_dyn;
             if (!flist->att_list) {
                 continue;
             }
             cf = flist->att_list->first;
             for (cf = clist_begin(flist->att_list); cf!=NULL; cf = clist_next(cf)) {
                 cflag = (mailimap_flag_fetch*)cf->data;
                 if (cflag->fl_type==MAILIMAP_FLAG_FETCH_OTHER && cflag->fl_flag!=0) {
                     switch (cflag->fl_flag->fl_type) {
                     case MAILIMAP_FLAG_ANSWERED:  /* \Answered flag */
                         mFlags.setBit(FLAG_ANSWERED);
                         break;
                     case MAILIMAP_FLAG_FLAGGED:   /* \Flagged flag */
                         mFlags.setBit(FLAG_FLAGGED);
                         break;
                     case MAILIMAP_FLAG_DELETED:   /* \Deleted flag */
                         mFlags.setBit(FLAG_DELETED);
                         break;
                     case MAILIMAP_FLAG_SEEN:      /* \Seen flag */
                         mFlags.setBit(FLAG_SEEN);
                         break;
                     case MAILIMAP_FLAG_DRAFT:     /* \Draft flag */
                         mFlags.setBit(FLAG_DRAFT);
                         break;
                     case MAILIMAP_FLAG_KEYWORD:   /* keyword flag */
                         break;
                     case MAILIMAP_FLAG_EXTENSION: /* \extension flag */
                         break;
                     default:
                         break;
                     }
                 } else if (cflag->fl_type==MAILIMAP_FLAG_FETCH_RECENT) {
                     mFlags.setBit(FLAG_RECENT);
                 }
             }
             continue;
         }
         if (item->att_data.att_static->att_type==MAILIMAP_MSG_ATT_ENVELOPE) {
             mailimap_envelope * head = item->att_data.att_static->att_data.att_env;
             m->setDate(head->env_date);
             m->setSubject(head->env_subject);
             if (head->env_from!=NULL) {
                 addresslist = address_list_to_stringlist(head->env_from->frm_list);
                 if (addresslist.count()) {
                     m->setFrom(addresslist.first());
                 }
             }
             if (head->env_to!=NULL) {
                 addresslist = address_list_to_stringlist(head->env_to->to_list);
                 m->setTo(addresslist);
             }
             if (head->env_cc!=NULL) {
                 addresslist = address_list_to_stringlist(head->env_cc->cc_list);
                 m->setCC(addresslist);
             }
             if (head->env_bcc!=NULL) {
                 addresslist = address_list_to_stringlist(head->env_bcc->bcc_list);
                 m->setBcc(addresslist);
             }
             if (head->env_reply_to!=NULL) {
                 addresslist = address_list_to_stringlist(head->env_reply_to->rt_list);
                 if (addresslist.count()) {
                     m->setReplyto(addresslist.first());
                 }
             }
             m->setMsgid(QString(head->env_message_id));
         } else if (item->att_data.att_static->att_type==MAILIMAP_MSG_ATT_INTERNALDATE) {
             mailimap_date_time*d = item->att_data.att_static->att_data.att_internal_date;
 #if 0            
             QDateTime da(QDate(d->dt_year,d->dt_month,d->dt_day),QTime(d->dt_hour,d->dt_min,d->dt_sec));
             qDebug("%i %i %i - %i %i %i",d->dt_year,d->dt_month,d->dt_day,d->dt_hour,d->dt_min,d->dt_sec);
             qDebug(da.toString());
 #endif            
         } else if (item->att_data.att_static->att_type==MAILIMAP_MSG_ATT_RFC822_SIZE) {
             size = item->att_data.att_static->att_data.att_rfc822_size;
         }
     }
     /* msg is already deleted */
     if (mFlags.testBit(FLAG_DELETED) && m) {
         delete m;
         m = 0;
     }
     if (m) {
         m->setFlags(mFlags);
         m->setMsgsize(size);
     }
     return m;
 }
 
 RecBody IMAPwrapper::fetchBody(const RecMail&mail)
 {
     RecBody body;
     const char *mb;
     int err = MAILIMAP_NO_ERROR;
     clist *result;
     clistcell *current;
     mailimap_fetch_att *fetchAtt;
     mailimap_fetch_type *fetchType;
     mailimap_set *set;
     mailimap_body*body_desc;
 
     mb = mail.getMbox().latin1();
 
     login();
     if (!m_imap) {
         return body;
     }
     
     err = mailimap_select( m_imap, (char*)mb);
     if ( err != MAILIMAP_NO_ERROR ) {
         qDebug("error selecting mailbox: %s",m_imap->imap_response);
         return body;
     }
  
     result = clist_new();
     /* the range has to start at 1!!! not with 0!!!! */
     set = mailimap_set_new_interval( mail.getNumber(),mail.getNumber() );
     fetchAtt = mailimap_fetch_att_new_bodystructure();
     fetchType = mailimap_fetch_type_new_fetch_att(fetchAtt);
     err = mailimap_fetch( m_imap, set, fetchType, &result );
     mailimap_set_free( set );
     mailimap_fetch_type_free( fetchType );
 
     if (err == MAILIMAP_NO_ERROR && (current=clist_begin(result)) ) {
         mailimap_msg_att * msg_att;
         msg_att = (mailimap_msg_att*)current->data;
         mailimap_msg_att_item*item = (mailimap_msg_att_item*)msg_att->att_list->first->data;
         body_desc = item->att_data.att_static->att_data.att_body;
         if (body_desc->bd_type==MAILIMAP_BODY_1PART) {
             searchBodyText(mail,body_desc->bd_data.bd_body_1part,body);
         } else if (body_desc->bd_type==MAILIMAP_BODY_MPART) {
             qDebug("Mulitpart mail");
             searchBodyText(mail,body_desc->bd_data.bd_body_mpart,body);
         }
     } else {
         qDebug("error fetching body: %s",m_imap->imap_response);
     }
     mailimap_fetch_list_free(result);
     return body;
 }
 
 /* this routine is just called when the mail has only ONE part.
    for filling the parts of a multi-part-message there are other
    routines 'cause we can not simply fetch the whole body. */
 void IMAPwrapper::searchBodyText(const RecMail&mail,mailimap_body_type_1part*mailDescription,RecBody&target_body)
 {
     if (!mailDescription) {
         return;
     }
     QString sub,body_text;
     RecPart singlePart;
     QValueList<int> path;
     fillSinglePart(singlePart,mailDescription);
     switch (mailDescription->bd_type) {
     case MAILIMAP_BODY_TYPE_1PART_MSG:
         path.append(1);
         body_text = fetchPart(mail,path,true);
         target_body.setBodytext(body_text);
         target_body.setDescription(singlePart);
         break;
     case MAILIMAP_BODY_TYPE_1PART_TEXT:
         qDebug("Mediatype single: %s",mailDescription->bd_data.bd_type_text->bd_media_text);
         path.append(1);
         body_text = fetchPart(mail,path,true);
         target_body.setBodytext(body_text);
         target_body.setDescription(singlePart);
         break;
     case MAILIMAP_BODY_TYPE_1PART_BASIC:
         qDebug("Single attachment");
         target_body.setBodytext("");
         target_body.addPart(singlePart);
         break;
     default:
         break;
     }
     
     return;
 }
 
 QStringList IMAPwrapper::address_list_to_stringlist(clist*list)
 {
     QStringList l;
     QString from;
     bool named_from;
     clistcell *current = NULL;
     mailimap_address * current_address=NULL;
     if (!list) {
         return l;
     }
     unsigned int count = 0;
     for (current=clist_begin(list);current!= NULL;current=clist_next(current)) {
         from = "";
         named_from = false;
         current_address=(mailimap_address*)current->data;
         if (current_address->ad_personal_name){
             from+=QString(current_address->ad_personal_name);
             from+=" ";
             named_from = true;
         }
         if (named_from && (current_address->ad_mailbox_name || current_address->ad_host_name)) {
             from+="<";
         }
         if (current_address->ad_mailbox_name) {
             from+=QString(current_address->ad_mailbox_name);
             from+="@";
         }
         if (current_address->ad_host_name) {
              from+=QString(current_address->ad_host_name);
         }
         if (named_from && (current_address->ad_mailbox_name || current_address->ad_host_name)) {
            from+=">";
         }
         l.append(QString(from));
         if (++count > 99) {
             break;
         }
     }
     return l;
 }
 
 QString IMAPwrapper::fetchPart(const RecMail&mail,const QValueList<int>&path,bool internal_call)
 {
     QString body("");
     const char*mb;
     int err;
     mailimap_fetch_type *fetchType;
     mailimap_set *set;
     clistcell*current,*cur;
 
     login();
     if (!m_imap) {
         return body;
     }
     if (!internal_call) {
         mb = mail.getMbox().latin1();
         err = mailimap_select( m_imap, (char*)mb);
         if ( err != MAILIMAP_NO_ERROR ) {
             qDebug("error selecting mailbox: %s",m_imap->imap_response);
             return body;
         }
     }
     set = mailimap_set_new_single(mail.getNumber());
     clist*id_list=clist_new();
     for (unsigned j=0; j < path.count();++j) {
         uint32_t * p_id = (uint32_t *)malloc(sizeof(*p_id));
         *p_id = path[j];
         clist_append(id_list,p_id);
     }
     mailimap_section_part * section_part =  mailimap_section_part_new(id_list);
     mailimap_section_spec * section_spec =  mailimap_section_spec_new(MAILIMAP_SECTION_SPEC_SECTION_PART, NULL, section_part, NULL);
     mailimap_section * section = mailimap_section_new(section_spec);
     mailimap_fetch_att * fetch_att = mailimap_fetch_att_new_body_section(section);
     
     fetchType = mailimap_fetch_type_new_fetch_att(fetch_att);
     
     clist*result = clist_new();
     
     err = mailimap_fetch( m_imap, set, fetchType, &result );
     mailimap_set_free( set );
     mailimap_fetch_type_free( fetchType );
     
     if (err == MAILIMAP_NO_ERROR && (current=clist_begin(result)) ) {
         mailimap_msg_att * msg_att;
         msg_att = (mailimap_msg_att*)current->data;
         mailimap_msg_att_item*msg_att_item;
         for(cur = clist_begin(msg_att->att_list) ; cur != NULL ; cur = clist_next(cur)) {
             msg_att_item = (mailimap_msg_att_item*)clist_content(cur);
             if (msg_att_item->att_type == MAILIMAP_MSG_ATT_ITEM_STATIC) {
                 if (msg_att_item->att_data.att_static->att_type == MAILIMAP_MSG_ATT_BODY_SECTION) {
                     char*text = msg_att_item->att_data.att_static->att_data.att_body_section->sec_body_part;
                     msg_att_item->att_data.att_static->att_data.att_body_section->sec_body_part = 0L;
                     if (text) {
                         body = QString(text);
                         free(text);
                     } else {
                         body = "";
                     }
                 }
             }
         }
          
     } else {
         qDebug("error fetching text: %s",m_imap->imap_response);
     }
     mailimap_fetch_list_free(result);
     return body;
 }
 
 void IMAPwrapper::searchBodyText(const RecMail&mail,mailimap_body_type_mpart*mailDescription,RecBody&target_body,int current_recursion,QValueList<int>recList)
 {
     /* current_recursion is for avoiding ugly mails which has a to deep body-structure */
     if (!mailDescription||current_recursion==10) {
         return;
     }
     clistcell*current;
     mailimap_body*current_body;
     unsigned int count = 0;
     for (current=clist_begin(mailDescription->bd_list);current!=0;current=clist_next(current)) {
         /* the point in the message */
         ++count;
         current_body = (mailimap_body*)current->data;
         if (current_body->bd_type==MAILIMAP_BODY_MPART) {
             QValueList<int>clist = recList;
             clist.append(count);
             searchBodyText(mail,current_body->bd_data.bd_body_mpart,target_body,current_recursion+1,clist);
         } else if (current_body->bd_type==MAILIMAP_BODY_1PART){
             RecPart currentPart;
             fillSinglePart(currentPart,current_body->bd_data.bd_body_1part);
             QValueList<int>clist = recList;    
             clist.append(count);
             /* important: Check for is NULL 'cause a body can be empty! */
             if (currentPart.Type()=="text" && target_body.Bodytext().isNull() ) {
                 QString body_text = fetchPart(mail,clist,true);
                 target_body.setDescription(currentPart);
                 target_body.setBodytext(body_text);
             } else {
                 QString id("");
                 for (unsigned int j = 0; j < clist.count();++j) {
                     id+=(j>0?" ":"");
                     id+=QString("%1").arg(clist[j]);
                 }
                 qDebug("ID= %s",id.latin1());
                 currentPart.setIdentifier(id);
                 currentPart.setPositionlist(clist);
                 target_body.addPart(currentPart);
             }
         }
     }
 }
 
 void IMAPwrapper::fillSinglePart(RecPart&target_part,mailimap_body_type_1part*Description)
 {
     if (!Description) {
         return;
     }
     switch (Description->bd_type) {
         case MAILIMAP_BODY_TYPE_1PART_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:
             fillSingleMsgPart(target_part,Description->bd_data.bd_type_msg);
             break;
         default:
             break;
     }
 }
 
 void IMAPwrapper::fillSingleTextPart(RecPart&target_part,mailimap_body_type_text*which)
 {
     if (!which) {
         return;
     }
     QString sub;
     sub = which->bd_media_text;
     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)
 {
     if (!which) {
         return;
     }
 //    QString sub;
 //    sub = which->bd_media_text;
 //    target_part.setSubtype(sub.lower());
     qDebug("Message part");
     /* we set this type to text/plain */
     target_part.setType("text");
     target_part.setSubtype("plain");
     target_part.setLines(which->bd_lines);
     fillBodyFields(target_part,which->bd_fields);    
 }
 
 void IMAPwrapper::fillSingleBasicPart(RecPart&target_part,mailimap_body_type_basic*which)
 {
     if (!which) {
         return;
     }
     QString type,sub;
     switch (which->bd_media_basic->med_type) {
     case MAILIMAP_MEDIA_BASIC_APPLICATION:
         type = "application";
         break;
     case MAILIMAP_MEDIA_BASIC_AUDIO:
         type = "audio";
         break;
     case MAILIMAP_MEDIA_BASIC_IMAGE:
         type = "image";
         break;
     case MAILIMAP_MEDIA_BASIC_MESSAGE:
         type = "message";
         break;
     case MAILIMAP_MEDIA_BASIC_VIDEO:
         type = "video";
         break;
     case MAILIMAP_MEDIA_BASIC_OTHER:
     default:
         if (which->bd_media_basic->med_basic_type) {
             type = which->bd_media_basic->med_basic_type;
         } else {
             type = "";
         }
         break;
     }
     if (which->bd_media_basic->med_subtype) {
         sub = which->bd_media_basic->med_subtype;
     } else {
         sub = "";
     }
     qDebug("Type = %s/%s",type.latin1(),sub.latin1());
     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)
 {
     if (!which) return;
     if (which->bd_parameter && which->bd_parameter->pa_list && which->bd_parameter->pa_list->count>0) {
         clistcell*cur;
         mailimap_single_body_fld_param*param=0;
         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));
             }
         }
     }
     mailimap_body_fld_enc*enc = which->bd_encoding;
     QString encoding("");
     switch (enc->enc_type) {
     case MAILIMAP_BODY_FLD_ENC_7BIT:
         encoding = "7bit";
         break;
     case MAILIMAP_BODY_FLD_ENC_8BIT:
         encoding = "8bit";
         break;
     case MAILIMAP_BODY_FLD_ENC_BINARY:
         encoding="binary";
         break;
     case MAILIMAP_BODY_FLD_ENC_BASE64:
         encoding="base64";
         break;
     case MAILIMAP_BODY_FLD_ENC_QUOTED_PRINTABLE:
         encoding="quoted-printable";
         break;
     case MAILIMAP_BODY_FLD_ENC_OTHER:
     default:
         if (enc->enc_value) {
             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)
 {
     return fetchPart(mail,part.Positionlist(),false);
 }
 
 void IMAPwrapper::deleteMail(const RecMail&mail)
 {
     mailimap_flag_list*flist;
     mailimap_set *set;
     mailimap_store_att_flags * store_flags;
     int err;
     login();
     if (!m_imap) {
         return;
     }
     const char *mb = mail.getMbox().latin1();
     err = mailimap_select( m_imap, (char*)mb);
     if ( err != MAILIMAP_NO_ERROR ) {
         qDebug("error selecting mailbox for delete: %s",m_imap->imap_response);
         return;
     }
     flist = mailimap_flag_list_new_empty();
     mailimap_flag_list_add(flist,mailimap_flag_new_deleted());
     store_flags = mailimap_store_att_flags_new_set_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) {
         qDebug("error deleting mail: %s",m_imap->imap_response);
         return;
     }
     qDebug("deleting mail: %s",m_imap->imap_response);
     /* should we realy do that at this moment? */
     err = mailimap_expunge(m_imap);
     if (err != MAILIMAP_NO_ERROR) {
         qDebug("error deleting mail: %s",m_imap->imap_response);
     }
     qDebug("Delete successfull %s",m_imap->imap_response);
 }
 
 void IMAPwrapper::answeredMail(const RecMail&mail)
 {
     mailimap_flag_list*flist;
     mailimap_set *set;
     mailimap_store_att_flags * store_flags;
     int err;
     login();
     if (!m_imap) {
         return;
     }
     const char *mb = mail.getMbox().latin1();
     err = mailimap_select( m_imap, (char*)mb);
     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) {
         qDebug("error marking mail: %s",m_imap->imap_response);
         return;
     }
 }
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
@@ -1,773 +1,776 @@
 
 #include <stdlib.h>
 
 #include "imapwrapper.h"
 #include "mailtypes.h"
 #include <libetpan/mailimap.h>
 
 IMAPwrapper::IMAPwrapper( IMAPaccount *a )
     : AbstractMail()
 {
     account = a;
     m_imap = 0;
 }
 
 IMAPwrapper::~IMAPwrapper()
 {
     logout();
 }
 
 void IMAPwrapper::imap_progress( size_t current, size_t maximum )
 {
     qDebug( "IMAP: %i of %i", current, maximum );
 }
 
 void IMAPwrapper::login()
 {
     const char *server, *user, *pass;
     uint16_t port;
     int err = MAILIMAP_NO_ERROR;
 
     /* we are connected this moment */
     /* TODO: setup a timer holding the line or if connection closed - delete the value */
     if (m_imap) {
         mailstream_flush(m_imap->imap_stream);
         return;
     }
     server = account->getServer().latin1();
     port = account->getPort().toUInt();
     user = account->getUser().latin1();
     pass = account->getPassword().latin1();
 
     m_imap = mailimap_new( 20, &imap_progress );
     /* connect */
     if (account->getSSL()) {
         err = mailimap_ssl_connect( m_imap, (char*)server, port );
     } else {
         err = mailimap_socket_connect( m_imap, (char*)server, port );
     }
 
     if ( err != MAILIMAP_NO_ERROR &&
          err != MAILIMAP_NO_ERROR_AUTHENTICATED &&
          err != MAILIMAP_NO_ERROR_NON_AUTHENTICATED ) {
          qDebug("error connecting server: %s",m_imap->imap_response);
          mailimap_free( m_imap );
          m_imap = 0;
          return;
     }
 
     /* login */
     err = mailimap_login_simple( m_imap, (char*)user, (char*)pass );
     if ( err != MAILIMAP_NO_ERROR ) {
         qDebug("error logging in imap: %s",m_imap->imap_response);
         err = mailimap_close( m_imap );
         mailimap_free( m_imap );
         m_imap = 0;
     }
 }
 
 void IMAPwrapper::logout()
 {
     int err = MAILIMAP_NO_ERROR;
     if (!m_imap) return;
     err = mailimap_logout( m_imap );
     err = mailimap_close( m_imap );
     mailimap_free( m_imap );
     m_imap = 0;
 }
 
 void IMAPwrapper::listMessages(const QString&mailbox,QList<RecMail> &target )
 {
     const char *mb;
     int err = MAILIMAP_NO_ERROR;
     clist *result;
     clistcell *current;
 //    mailimap_fetch_att *fetchAtt,*fetchAttFlags,*fetchAttDate,*fetchAttSize;
     mailimap_fetch_type *fetchType;
     mailimap_set *set;
 
     mb = mailbox.latin1();
     login();
     if (!m_imap) {
         return;
     }
     /* select mailbox READONLY for operations */
     err = mailimap_examine( m_imap, (char*)mb);
     if ( err != MAILIMAP_NO_ERROR ) {
         qDebug("error selecting mailbox: %s",m_imap->imap_response);
         return;
     }
 
     int last = m_imap->imap_selection_info->sel_exists;
 
     if (last == 0) {
         qDebug("mailbox has no mails");
         return;
     }
 
     result = clist_new();
     /* the range has to start at 1!!! not with 0!!!! */
     set = mailimap_set_new_interval( 1, last );
     fetchType = mailimap_fetch_type_new_fetch_att_list_empty();
     mailimap_fetch_type_new_fetch_att_list_add(fetchType,mailimap_fetch_att_new_envelope());
     mailimap_fetch_type_new_fetch_att_list_add(fetchType,mailimap_fetch_att_new_flags());
     mailimap_fetch_type_new_fetch_att_list_add(fetchType,mailimap_fetch_att_new_internaldate());
     mailimap_fetch_type_new_fetch_att_list_add(fetchType,mailimap_fetch_att_new_rfc822_size());
 
     err = mailimap_fetch( m_imap, set, fetchType, &result );
     mailimap_set_free( set );
     mailimap_fetch_type_free( fetchType );
 
     QString date,subject,from;
 
     if ( err == MAILIMAP_NO_ERROR ) {
         
         mailimap_msg_att * msg_att;
         int i = 0;
         for (current = clist_begin(result); current != 0; current=clist_next(current)) {
             ++i;
             msg_att = (mailimap_msg_att*)current->data;
             RecMail*m = parse_list_result(msg_att);
             if (m) {
                 m->setNumber(i);
                 m->setMbox(mailbox);
                 m->setWrapper(this);
                 target.append(m);
             }
         }
     } else {
         qDebug("Error fetching headers: %s",m_imap->imap_response);
     }
     mailimap_fetch_list_free(result);
 }
 
 QList<Folder>* IMAPwrapper::listFolders()
 {
     const char *path, *mask;
     int err = MAILIMAP_NO_ERROR;
     clist *result;
     clistcell *current;
 
     QList<Folder> * folders = new QList<Folder>();
     folders->setAutoDelete( false );
     login();
     if (!m_imap) {
         return folders;
     }
 
 /*
  * First we have to check for INBOX 'cause it sometimes it's not inside the path.
  * We must not forget to filter them out in next loop!
  * it seems like ugly code. and yes - it is ugly code. but the best way.
  */
     QString temp;
     mask = "INBOX" ;
     result = clist_new();
     mailimap_mailbox_list *list;
     err = mailimap_list( m_imap, (char*)"", (char*)mask, &result );
     if ( err == MAILIMAP_NO_ERROR ) {
         current = result->first;
         for ( int i = result->count; i > 0; i-- ) {
             list = (mailimap_mailbox_list *) current->data;
             // it is better use the deep copy mechanism of qt itself
             // instead of using strdup!
             temp = list->mb_name;
             folders->append( new IMAPFolder(temp));
             current = current->next;
         }
     } else {
         qDebug("error fetching folders: %s",m_imap->imap_response);
     }
     mailimap_list_result_free( result );
 
 /*
  * second stage - get the other then inbox folders
  */
     mask = "*" ;
     path = account->getPrefix().latin1();
     if (!path) path = "";
     result = clist_new();
     qDebug(path);
     bool selectable = true;
     mailimap_mbx_list_flags*bflags;
     err = mailimap_list( m_imap, (char*)path, (char*)mask, &result );
     if ( err == MAILIMAP_NO_ERROR ) {
         current = result->first;
         for ( current=clist_begin(result);current!=NULL;current=clist_next(current)) {
             list = (mailimap_mailbox_list *) current->data;
             // it is better use the deep copy mechanism of qt itself
             // instead of using strdup!
             temp = list->mb_name;
             if (temp.lower()=="inbox")
                 continue;
             if (temp.lower()==account->getPrefix().lower())
                 continue;
             if ( (bflags = list->mb_flag) ) {
                 selectable = !(bflags->mbf_type==MAILIMAP_MBX_LIST_FLAGS_SFLAG&&
                             bflags->mbf_sflag==MAILIMAP_MBX_LIST_SFLAG_NOSELECT);
             }
             folders->append(new IMAPFolder(temp,selectable,account->getPrefix()));
         }
     } else {
         qDebug("error fetching folders %s",m_imap->imap_response);
     }
     mailimap_list_result_free( result );
     return folders;
 }
 
 RecMail*IMAPwrapper::parse_list_result(mailimap_msg_att* m_att)
 {
     RecMail * m = 0;
     mailimap_msg_att_item *item=0;
     clistcell *current,*c,*cf;
     mailimap_msg_att_dynamic*flist;
     mailimap_flag_fetch*cflag;
     int size;
     QBitArray mFlags(7);
     QStringList addresslist;
 
     if (!m_att) {
         return m;
     }
     m = new RecMail();
     for (c = clist_begin(m_att->att_list); c!=NULL;c=clist_next(c) ) {
         current = c;
         size = 0;
         item = (mailimap_msg_att_item*)current->data;
         if (item->att_type!=MAILIMAP_MSG_ATT_ITEM_STATIC) {
             flist = (mailimap_msg_att_dynamic*)item->att_data.att_dyn;
             if (!flist->att_list) {
                 continue;
             }
             cf = flist->att_list->first;
             for (cf = clist_begin(flist->att_list); cf!=NULL; cf = clist_next(cf)) {
                 cflag = (mailimap_flag_fetch*)cf->data;
                 if (cflag->fl_type==MAILIMAP_FLAG_FETCH_OTHER && cflag->fl_flag!=0) {
                     switch (cflag->fl_flag->fl_type) {
                     case MAILIMAP_FLAG_ANSWERED:  /* \Answered flag */
                         mFlags.setBit(FLAG_ANSWERED);
                         break;
                     case MAILIMAP_FLAG_FLAGGED:   /* \Flagged flag */
                         mFlags.setBit(FLAG_FLAGGED);
                         break;
                     case MAILIMAP_FLAG_DELETED:   /* \Deleted flag */
                         mFlags.setBit(FLAG_DELETED);
                         break;
                     case MAILIMAP_FLAG_SEEN:      /* \Seen flag */
                         mFlags.setBit(FLAG_SEEN);
                         break;
                     case MAILIMAP_FLAG_DRAFT:     /* \Draft flag */
                         mFlags.setBit(FLAG_DRAFT);
                         break;
                     case MAILIMAP_FLAG_KEYWORD:   /* keyword flag */
                         break;
                     case MAILIMAP_FLAG_EXTENSION: /* \extension flag */
                         break;
                     default:
                         break;
                     }
                 } else if (cflag->fl_type==MAILIMAP_FLAG_FETCH_RECENT) {
                     mFlags.setBit(FLAG_RECENT);
                 }
             }
             continue;
         }
         if (item->att_data.att_static->att_type==MAILIMAP_MSG_ATT_ENVELOPE) {
             mailimap_envelope * head = item->att_data.att_static->att_data.att_env;
             m->setDate(head->env_date);
             m->setSubject(head->env_subject);
             if (head->env_from!=NULL) {
                 addresslist = address_list_to_stringlist(head->env_from->frm_list);
                 if (addresslist.count()) {
                     m->setFrom(addresslist.first());
                 }
             }
             if (head->env_to!=NULL) {
                 addresslist = address_list_to_stringlist(head->env_to->to_list);
                 m->setTo(addresslist);
             }
             if (head->env_cc!=NULL) {
                 addresslist = address_list_to_stringlist(head->env_cc->cc_list);
                 m->setCC(addresslist);
             }
             if (head->env_bcc!=NULL) {
                 addresslist = address_list_to_stringlist(head->env_bcc->bcc_list);
                 m->setBcc(addresslist);
             }
             if (head->env_reply_to!=NULL) {
                 addresslist = address_list_to_stringlist(head->env_reply_to->rt_list);
                 if (addresslist.count()) {
                     m->setReplyto(addresslist.first());
                 }
             }
             m->setMsgid(QString(head->env_message_id));
         } else if (item->att_data.att_static->att_type==MAILIMAP_MSG_ATT_INTERNALDATE) {
             mailimap_date_time*d = item->att_data.att_static->att_data.att_internal_date;
 #if 0            
             QDateTime da(QDate(d->dt_year,d->dt_month,d->dt_day),QTime(d->dt_hour,d->dt_min,d->dt_sec));
             qDebug("%i %i %i - %i %i %i",d->dt_year,d->dt_month,d->dt_day,d->dt_hour,d->dt_min,d->dt_sec);
             qDebug(da.toString());
 #endif            
         } else if (item->att_data.att_static->att_type==MAILIMAP_MSG_ATT_RFC822_SIZE) {
             size = item->att_data.att_static->att_data.att_rfc822_size;
         }
     }
     /* msg is already deleted */
     if (mFlags.testBit(FLAG_DELETED) && m) {
         delete m;
         m = 0;
     }
     if (m) {
         m->setFlags(mFlags);
         m->setMsgsize(size);
     }
     return m;
 }
 
 RecBody IMAPwrapper::fetchBody(const RecMail&mail)
 {
     RecBody body;
     const char *mb;
     int err = MAILIMAP_NO_ERROR;
     clist *result;
     clistcell *current;
     mailimap_fetch_att *fetchAtt;
     mailimap_fetch_type *fetchType;
     mailimap_set *set;
     mailimap_body*body_desc;
 
     mb = mail.getMbox().latin1();
 
     login();
     if (!m_imap) {
         return body;
     }
     
     err = mailimap_select( m_imap, (char*)mb);
     if ( err != MAILIMAP_NO_ERROR ) {
         qDebug("error selecting mailbox: %s",m_imap->imap_response);
         return body;
     }
  
     result = clist_new();
     /* the range has to start at 1!!! not with 0!!!! */
     set = mailimap_set_new_interval( mail.getNumber(),mail.getNumber() );
     fetchAtt = mailimap_fetch_att_new_bodystructure();
     fetchType = mailimap_fetch_type_new_fetch_att(fetchAtt);
     err = mailimap_fetch( m_imap, set, fetchType, &result );
     mailimap_set_free( set );
     mailimap_fetch_type_free( fetchType );
 
     if (err == MAILIMAP_NO_ERROR && (current=clist_begin(result)) ) {
         mailimap_msg_att * msg_att;
         msg_att = (mailimap_msg_att*)current->data;
         mailimap_msg_att_item*item = (mailimap_msg_att_item*)msg_att->att_list->first->data;
         body_desc = item->att_data.att_static->att_data.att_body;
         if (body_desc->bd_type==MAILIMAP_BODY_1PART) {
             searchBodyText(mail,body_desc->bd_data.bd_body_1part,body);
         } else if (body_desc->bd_type==MAILIMAP_BODY_MPART) {
             qDebug("Mulitpart mail");
             searchBodyText(mail,body_desc->bd_data.bd_body_mpart,body);
         }
     } else {
         qDebug("error fetching body: %s",m_imap->imap_response);
     }
     mailimap_fetch_list_free(result);
     return body;
 }
 
 /* this routine is just called when the mail has only ONE part.
    for filling the parts of a multi-part-message there are other
    routines 'cause we can not simply fetch the whole body. */
 void IMAPwrapper::searchBodyText(const RecMail&mail,mailimap_body_type_1part*mailDescription,RecBody&target_body)
 {
     if (!mailDescription) {
         return;
     }
     QString sub,body_text;
     RecPart singlePart;
     QValueList<int> path;
     fillSinglePart(singlePart,mailDescription);
     switch (mailDescription->bd_type) {
     case MAILIMAP_BODY_TYPE_1PART_MSG:
         path.append(1);
         body_text = fetchPart(mail,path,true);
         target_body.setBodytext(body_text);
         target_body.setDescription(singlePart);
         break;
     case MAILIMAP_BODY_TYPE_1PART_TEXT:
         qDebug("Mediatype single: %s",mailDescription->bd_data.bd_type_text->bd_media_text);
         path.append(1);
         body_text = fetchPart(mail,path,true);
         target_body.setBodytext(body_text);
         target_body.setDescription(singlePart);
         break;
     case MAILIMAP_BODY_TYPE_1PART_BASIC:
         qDebug("Single attachment");
         target_body.setBodytext("");
         target_body.addPart(singlePart);
         break;
     default:
         break;
     }
     
     return;
 }
 
 QStringList IMAPwrapper::address_list_to_stringlist(clist*list)
 {
     QStringList l;
     QString from;
     bool named_from;
     clistcell *current = NULL;
     mailimap_address * current_address=NULL;
     if (!list) {
         return l;
     }
     unsigned int count = 0;
     for (current=clist_begin(list);current!= NULL;current=clist_next(current)) {
         from = "";
         named_from = false;
         current_address=(mailimap_address*)current->data;
         if (current_address->ad_personal_name){
             from+=QString(current_address->ad_personal_name);
             from+=" ";
             named_from = true;
         }
         if (named_from && (current_address->ad_mailbox_name || current_address->ad_host_name)) {
             from+="<";
         }
         if (current_address->ad_mailbox_name) {
             from+=QString(current_address->ad_mailbox_name);
             from+="@";
         }
         if (current_address->ad_host_name) {
              from+=QString(current_address->ad_host_name);
         }
         if (named_from && (current_address->ad_mailbox_name || current_address->ad_host_name)) {
            from+=">";
         }
         l.append(QString(from));
         if (++count > 99) {
             break;
         }
     }
     return l;
 }
 
 QString IMAPwrapper::fetchPart(const RecMail&mail,const QValueList<int>&path,bool internal_call)
 {
     QString body("");
     const char*mb;
     int err;
     mailimap_fetch_type *fetchType;
     mailimap_set *set;
     clistcell*current,*cur;
 
     login();
     if (!m_imap) {
         return body;
     }
     if (!internal_call) {
         mb = mail.getMbox().latin1();
         err = mailimap_select( m_imap, (char*)mb);
         if ( err != MAILIMAP_NO_ERROR ) {
             qDebug("error selecting mailbox: %s",m_imap->imap_response);
             return body;
         }
     }
     set = mailimap_set_new_single(mail.getNumber());
     clist*id_list=clist_new();
     for (unsigned j=0; j < path.count();++j) {
         uint32_t * p_id = (uint32_t *)malloc(sizeof(*p_id));
         *p_id = path[j];
         clist_append(id_list,p_id);
     }
     mailimap_section_part * section_part =  mailimap_section_part_new(id_list);
     mailimap_section_spec * section_spec =  mailimap_section_spec_new(MAILIMAP_SECTION_SPEC_SECTION_PART, NULL, section_part, NULL);
     mailimap_section * section = mailimap_section_new(section_spec);
     mailimap_fetch_att * fetch_att = mailimap_fetch_att_new_body_section(section);
     
     fetchType = mailimap_fetch_type_new_fetch_att(fetch_att);
     
     clist*result = clist_new();
     
     err = mailimap_fetch( m_imap, set, fetchType, &result );
     mailimap_set_free( set );
     mailimap_fetch_type_free( fetchType );
     
     if (err == MAILIMAP_NO_ERROR && (current=clist_begin(result)) ) {
         mailimap_msg_att * msg_att;
         msg_att = (mailimap_msg_att*)current->data;
         mailimap_msg_att_item*msg_att_item;
         for(cur = clist_begin(msg_att->att_list) ; cur != NULL ; cur = clist_next(cur)) {
             msg_att_item = (mailimap_msg_att_item*)clist_content(cur);
             if (msg_att_item->att_type == MAILIMAP_MSG_ATT_ITEM_STATIC) {
                 if (msg_att_item->att_data.att_static->att_type == MAILIMAP_MSG_ATT_BODY_SECTION) {
                     char*text = msg_att_item->att_data.att_static->att_data.att_body_section->sec_body_part;
                     msg_att_item->att_data.att_static->att_data.att_body_section->sec_body_part = 0L;
                     if (text) {
                         body = QString(text);
                         free(text);
                     } else {
                         body = "";
                     }
                 }
             }
         }
          
     } else {
         qDebug("error fetching text: %s",m_imap->imap_response);
     }
     mailimap_fetch_list_free(result);
     return body;
 }
 
 void IMAPwrapper::searchBodyText(const RecMail&mail,mailimap_body_type_mpart*mailDescription,RecBody&target_body,int current_recursion,QValueList<int>recList)
 {
     /* current_recursion is for avoiding ugly mails which has a to deep body-structure */
     if (!mailDescription||current_recursion==10) {
         return;
     }
     clistcell*current;
     mailimap_body*current_body;
     unsigned int count = 0;
     for (current=clist_begin(mailDescription->bd_list);current!=0;current=clist_next(current)) {
         /* the point in the message */
         ++count;
         current_body = (mailimap_body*)current->data;
         if (current_body->bd_type==MAILIMAP_BODY_MPART) {
             QValueList<int>clist = recList;
             clist.append(count);
             searchBodyText(mail,current_body->bd_data.bd_body_mpart,target_body,current_recursion+1,clist);
         } else if (current_body->bd_type==MAILIMAP_BODY_1PART){
             RecPart currentPart;
             fillSinglePart(currentPart,current_body->bd_data.bd_body_1part);
             QValueList<int>clist = recList;    
             clist.append(count);
             /* important: Check for is NULL 'cause a body can be empty! */
             if (currentPart.Type()=="text" && target_body.Bodytext().isNull() ) {
                 QString body_text = fetchPart(mail,clist,true);
                 target_body.setDescription(currentPart);
                 target_body.setBodytext(body_text);
             } else {
                 QString id("");
                 for (unsigned int j = 0; j < clist.count();++j) {
                     id+=(j>0?" ":"");
                     id+=QString("%1").arg(clist[j]);
                 }
                 qDebug("ID= %s",id.latin1());
                 currentPart.setIdentifier(id);
                 currentPart.setPositionlist(clist);
                 target_body.addPart(currentPart);
             }
         }
     }
 }
 
 void IMAPwrapper::fillSinglePart(RecPart&target_part,mailimap_body_type_1part*Description)
 {
     if (!Description) {
         return;
     }
     switch (Description->bd_type) {
         case MAILIMAP_BODY_TYPE_1PART_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:
             fillSingleMsgPart(target_part,Description->bd_data.bd_type_msg);
             break;
         default:
             break;
     }
 }
 
 void IMAPwrapper::fillSingleTextPart(RecPart&target_part,mailimap_body_type_text*which)
 {
     if (!which) {
         return;
     }
     QString sub;
     sub = which->bd_media_text;
     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)
 {
     if (!which) {
         return;
     }
 //    QString sub;
 //    sub = which->bd_media_text;
 //    target_part.setSubtype(sub.lower());
     qDebug("Message part");
     /* we set this type to text/plain */
     target_part.setType("text");
     target_part.setSubtype("plain");
     target_part.setLines(which->bd_lines);
     fillBodyFields(target_part,which->bd_fields);    
 }
 
 void IMAPwrapper::fillSingleBasicPart(RecPart&target_part,mailimap_body_type_basic*which)
 {
     if (!which) {
         return;
     }
     QString type,sub;
     switch (which->bd_media_basic->med_type) {
     case MAILIMAP_MEDIA_BASIC_APPLICATION:
         type = "application";
         break;
     case MAILIMAP_MEDIA_BASIC_AUDIO:
         type = "audio";
         break;
     case MAILIMAP_MEDIA_BASIC_IMAGE:
         type = "image";
         break;
     case MAILIMAP_MEDIA_BASIC_MESSAGE:
         type = "message";
         break;
     case MAILIMAP_MEDIA_BASIC_VIDEO:
         type = "video";
         break;
     case MAILIMAP_MEDIA_BASIC_OTHER:
     default:
         if (which->bd_media_basic->med_basic_type) {
             type = which->bd_media_basic->med_basic_type;
         } else {
             type = "";
         }
         break;
     }
     if (which->bd_media_basic->med_subtype) {
         sub = which->bd_media_basic->med_subtype;
     } else {
         sub = "";
     }
     qDebug("Type = %s/%s",type.latin1(),sub.latin1());
     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)
 {
     if (!which) return;
     if (which->bd_parameter && which->bd_parameter->pa_list && which->bd_parameter->pa_list->count>0) {
         clistcell*cur;
         mailimap_single_body_fld_param*param=0;
         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));
             }
         }
     }
     mailimap_body_fld_enc*enc = which->bd_encoding;
     QString encoding("");
     switch (enc->enc_type) {
     case MAILIMAP_BODY_FLD_ENC_7BIT:
         encoding = "7bit";
         break;
     case MAILIMAP_BODY_FLD_ENC_8BIT:
         encoding = "8bit";
         break;
     case MAILIMAP_BODY_FLD_ENC_BINARY:
         encoding="binary";
         break;
     case MAILIMAP_BODY_FLD_ENC_BASE64:
         encoding="base64";
         break;
     case MAILIMAP_BODY_FLD_ENC_QUOTED_PRINTABLE:
         encoding="quoted-printable";
         break;
     case MAILIMAP_BODY_FLD_ENC_OTHER:
     default:
         if (enc->enc_value) {
             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)
 {
     return fetchPart(mail,part.Positionlist(),false);
 }
 
 void IMAPwrapper::deleteMail(const RecMail&mail)
 {
     mailimap_flag_list*flist;
     mailimap_set *set;
     mailimap_store_att_flags * store_flags;
     int err;
     login();
     if (!m_imap) {
         return;
     }
     const char *mb = mail.getMbox().latin1();
     err = mailimap_select( m_imap, (char*)mb);
     if ( err != MAILIMAP_NO_ERROR ) {
         qDebug("error selecting mailbox for delete: %s",m_imap->imap_response);
         return;
     }
     flist = mailimap_flag_list_new_empty();
     mailimap_flag_list_add(flist,mailimap_flag_new_deleted());
     store_flags = mailimap_store_att_flags_new_set_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) {
         qDebug("error deleting mail: %s",m_imap->imap_response);
         return;
     }
     qDebug("deleting mail: %s",m_imap->imap_response);
     /* should we realy do that at this moment? */
     err = mailimap_expunge(m_imap);
     if (err != MAILIMAP_NO_ERROR) {
         qDebug("error deleting mail: %s",m_imap->imap_response);
     }
     qDebug("Delete successfull %s",m_imap->imap_response);
 }
 
 void IMAPwrapper::answeredMail(const RecMail&mail)
 {
     mailimap_flag_list*flist;
     mailimap_set *set;
     mailimap_store_att_flags * store_flags;
     int err;
     login();
     if (!m_imap) {
         return;
     }
     const char *mb = mail.getMbox().latin1();
     err = mailimap_select( m_imap, (char*)mb);
     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) {
         qDebug("error marking mail: %s",m_imap->imap_response);
         return;
     }
 }
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
@@ -1,237 +1,247 @@
 #include "mailtypes.h"
 
 
 RecMail::RecMail()
     :subject(""),date(""),from(""),mbox(""),msg_id(""),msg_number(0),msg_size(0),msg_flags(7)
 {
     init();
 }
 
 RecMail::RecMail(const RecMail&old)
     :subject(""),date(""),from(""),mbox(""),msg_id(""),msg_number(0),msg_flags(7)
 {
     init();
     copy_old(old);
     qDebug("Copy constructor RecMail");
 }
 
 RecMail::~RecMail()
 {
     wrapper = 0;
 }
 
 void RecMail::copy_old(const RecMail&old)
 {
     subject = old.subject;
     date = old.date;
     mbox = old.mbox;
     msg_id = old.msg_id;
     msg_size = old.msg_size;
     msg_number = old.msg_number;
     from = old.from;
     msg_flags = old.msg_flags;
     to = old.to;
     cc = old.cc;
     bcc = old.bcc;
     wrapper = old.wrapper;
 }
 
 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)
 {
     to = list;
 }
 
 const QStringList&RecMail::To()const
 {
     return to;
 }
 
 void RecMail::setCC(const QStringList&list)
 {
     cc = list;
 }
 
 const QStringList&RecMail::CC()const
 {
     return cc;
 }
 
 void RecMail::setBcc(const QStringList&list)
 {
     bcc = 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()
 {
 }
 
 void RecPart::setSize(unsigned int size)
 {
     m_size = size;
 }
     
 const unsigned int RecPart::Size()const
 {
     return m_size;
 }
 
 void RecPart::setLines(unsigned int lines)
 {
     m_lines = lines;
 }
     
 const unsigned int RecPart::Lines()const
 {
     return m_lines;
 }
 
 const QString& RecPart::Type()const
 {
     return m_type;
 }
 
 void RecPart::setType(const QString&type)
 {
     m_type = type;
 }
 
 const QString& RecPart::Subtype()const
 {
     return m_subtype;
 }
 
 void RecPart::setSubtype(const QString&subtype)
 {
     m_subtype = subtype;
 }
 
 const QString& RecPart::Identifier()const
 {
     return m_identifier;
 }
 
 void RecPart::setIdentifier(const QString&identifier)
 {
     m_identifier = identifier;
 }
 
 const QString& RecPart::Encoding()const
 {
     return m_encoding;
 }
 
 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
 {
     return m_Parameters;
 }
 
 void RecPart::addParameter(const QString&key,const QString&value)
 {
     m_Parameters[key]=value;
 }
 
 const QString RecPart::searchParamter(const QString&key)const
 {
     QString value("");
     part_plist_t::ConstIterator it = m_Parameters.find(key);
     if (it != m_Parameters.end()) {
         value = it.data();
     }
     return value;
 }
 
 void RecPart::setPositionlist(const QValueList<int>&poslist)
 {
     m_poslist = poslist;
 }
 
 const QValueList<int>& RecPart::Positionlist()const
 {
     return m_poslist;
 }
 
 RecBody::RecBody()
     : m_BodyText(),m_PartsList(),m_description()
 {
     m_PartsList.clear();
 }
 
 RecBody::~RecBody()
 {
 }
 
 void RecBody::setBodytext(const QString&bodyText)
 {
     m_BodyText = bodyText;
 }
 
 const QString& RecBody::Bodytext()const
 {
     return m_BodyText;
 }
 
 void RecBody::setParts(const QValueList<RecPart>&parts)
 {
     m_PartsList.clear();
     m_PartsList = parts;
 }
 
 const QValueList<RecPart>& RecBody::Parts()const
 {
     return m_PartsList;
 }
 
 void RecBody::addPart(const RecPart& part)
 {
     m_PartsList.append(part);
 }
 
 void RecBody::setDescription(const RecPart&des)
 {
     m_description = des;
 }
 
 const RecPart& RecBody::Description()const
 {
     return m_description;
 }
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
@@ -1,136 +1,138 @@
 #ifndef __MAIL_TYPES_H
 #define __MAIL_TYPES_H
 
 #define FLAG_ANSWERED 0
 #define FLAG_FLAGGED  1
 #define FLAG_DELETED  2
 #define FLAG_SEEN     3
 #define FLAG_DRAFT    4
 #define FLAG_RECENT   5
 
 #include <qlist.h>
 #include <qbitarray.h>
 #include <qstring.h>
 #include <qstringlist.h>
 #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
    store the mail body into this class, too.
    But: not from the point of view of the device. 
    Mailbodies can be real large. So we request them when 
    needed from the mail-wrapper class direct from the server itself
    (imap) or from a file-based cache (pop3?)
    So there is no interface "const QString&body()" but you should
    make a request to the mailwrapper with this class as parameter to
    get the body. Same words for the attachments.
 */
 class RecMail
 {
 public:
     RecMail();
     RecMail(const RecMail&old);
     virtual ~RecMail();
 
     const int getNumber()const{return msg_number;}
     void setNumber(int number){msg_number=number;}
     const QString&getDate()const{ return date; }
     void setDate( const QString&a ) { date = a; }
     const QString&getFrom()const{ return from; }
     void setFrom( const QString&a ) { from = a; }
     const QString&getSubject()const { return subject; }
     void setSubject( const QString&s ) { subject = s; }
     const QString&getMbox()const{return mbox;}
     void setMbox(const QString&box){mbox = box;}
     void setMsgid(const QString&id){msg_id=id;}
     const QString&Msgid()const{return msg_id;}
     void setReplyto(const QString&reply){replyto=reply;}
     const QString&Replyto()const{return replyto;}
     void setMsgsize(int size){msg_size = size;}
     const int Msgsize()const{return msg_size;}
 
 
     void setTo(const QStringList&list);
     const QStringList&To()const;
     void setCC(const QStringList&list);
     const QStringList&CC()const;
     void setBcc(const QStringList&list);
     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);
 };
 
 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:
     RecPart();
     virtual ~RecPart();
     
     const QString&Type()const;
     void setType(const QString&type);
     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;
 
     
     void setParameters(const part_plist_t&list);
     const part_plist_t&Parameters()const;
     void addParameter(const QString&key,const QString&value);
     const QString searchParamter(const QString&key)const;
     void setPositionlist(const QValueList<int>&poslist);
     const QValueList<int>& Positionlist()const;
 };
 
 class RecBody
 {
 protected:
     QString m_BodyText;
     QValueList<RecPart> m_PartsList;
     RecPart m_description;
 
 public:
     RecBody();
     virtual ~RecBody();
     void setBodytext(const QString&);
     const QString& Bodytext()const;
 
     void setDescription(const RecPart&des);
     const RecPart& Description()const;
     
     void setParts(const QValueList<RecPart>&parts);
     const QValueList<RecPart>& Parts()const;
     void addPart(const RecPart&part);
 };
 
 #endif
diff --git a/noncore/net/mail/mailtypes.cpp b/noncore/net/mail/mailtypes.cpp
index 94f5d6f..8d9b247 100644
--- a/noncore/net/mail/mailtypes.cpp
+++ b/noncore/net/mail/mailtypes.cpp
@@ -1,237 +1,247 @@
 #include "mailtypes.h"
 
 
 RecMail::RecMail()
     :subject(""),date(""),from(""),mbox(""),msg_id(""),msg_number(0),msg_size(0),msg_flags(7)
 {
     init();
 }
 
 RecMail::RecMail(const RecMail&old)
     :subject(""),date(""),from(""),mbox(""),msg_id(""),msg_number(0),msg_flags(7)
 {
     init();
     copy_old(old);
     qDebug("Copy constructor RecMail");
 }
 
 RecMail::~RecMail()
 {
     wrapper = 0;
 }
 
 void RecMail::copy_old(const RecMail&old)
 {
     subject = old.subject;
     date = old.date;
     mbox = old.mbox;
     msg_id = old.msg_id;
     msg_size = old.msg_size;
     msg_number = old.msg_number;
     from = old.from;
     msg_flags = old.msg_flags;
     to = old.to;
     cc = old.cc;
     bcc = old.bcc;
     wrapper = old.wrapper;
 }
 
 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)
 {
     to = list;
 }
 
 const QStringList&RecMail::To()const
 {
     return to;
 }
 
 void RecMail::setCC(const QStringList&list)
 {
     cc = list;
 }
 
 const QStringList&RecMail::CC()const
 {
     return cc;
 }
 
 void RecMail::setBcc(const QStringList&list)
 {
     bcc = 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()
 {
 }
 
 void RecPart::setSize(unsigned int size)
 {
     m_size = size;
 }
     
 const unsigned int RecPart::Size()const
 {
     return m_size;
 }
 
 void RecPart::setLines(unsigned int lines)
 {
     m_lines = lines;
 }
     
 const unsigned int RecPart::Lines()const
 {
     return m_lines;
 }
 
 const QString& RecPart::Type()const
 {
     return m_type;
 }
 
 void RecPart::setType(const QString&type)
 {
     m_type = type;
 }
 
 const QString& RecPart::Subtype()const
 {
     return m_subtype;
 }
 
 void RecPart::setSubtype(const QString&subtype)
 {
     m_subtype = subtype;
 }
 
 const QString& RecPart::Identifier()const
 {
     return m_identifier;
 }
 
 void RecPart::setIdentifier(const QString&identifier)
 {
     m_identifier = identifier;
 }
 
 const QString& RecPart::Encoding()const
 {
     return m_encoding;
 }
 
 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
 {
     return m_Parameters;
 }
 
 void RecPart::addParameter(const QString&key,const QString&value)
 {
     m_Parameters[key]=value;
 }
 
 const QString RecPart::searchParamter(const QString&key)const
 {
     QString value("");
     part_plist_t::ConstIterator it = m_Parameters.find(key);
     if (it != m_Parameters.end()) {
         value = it.data();
     }
     return value;
 }
 
 void RecPart::setPositionlist(const QValueList<int>&poslist)
 {
     m_poslist = poslist;
 }
 
 const QValueList<int>& RecPart::Positionlist()const
 {
     return m_poslist;
 }
 
 RecBody::RecBody()
     : m_BodyText(),m_PartsList(),m_description()
 {
     m_PartsList.clear();
 }
 
 RecBody::~RecBody()
 {
 }
 
 void RecBody::setBodytext(const QString&bodyText)
 {
     m_BodyText = bodyText;
 }
 
 const QString& RecBody::Bodytext()const
 {
     return m_BodyText;
 }
 
 void RecBody::setParts(const QValueList<RecPart>&parts)
 {
     m_PartsList.clear();
     m_PartsList = parts;
 }
 
 const QValueList<RecPart>& RecBody::Parts()const
 {
     return m_PartsList;
 }
 
 void RecBody::addPart(const RecPart& part)
 {
     m_PartsList.append(part);
 }
 
 void RecBody::setDescription(const RecPart&des)
 {
     m_description = des;
 }
 
 const RecPart& RecBody::Description()const
 {
     return m_description;
 }
diff --git a/noncore/net/mail/mailtypes.h b/noncore/net/mail/mailtypes.h
index 9ef762d..7d7bebc 100644
--- a/noncore/net/mail/mailtypes.h
+++ b/noncore/net/mail/mailtypes.h
@@ -1,136 +1,138 @@
 #ifndef __MAIL_TYPES_H
 #define __MAIL_TYPES_H
 
 #define FLAG_ANSWERED 0
 #define FLAG_FLAGGED  1
 #define FLAG_DELETED  2
 #define FLAG_SEEN     3
 #define FLAG_DRAFT    4
 #define FLAG_RECENT   5
 
 #include <qlist.h>
 #include <qbitarray.h>
 #include <qstring.h>
 #include <qstringlist.h>
 #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
    store the mail body into this class, too.
    But: not from the point of view of the device. 
    Mailbodies can be real large. So we request them when 
    needed from the mail-wrapper class direct from the server itself
    (imap) or from a file-based cache (pop3?)
    So there is no interface "const QString&body()" but you should
    make a request to the mailwrapper with this class as parameter to
    get the body. Same words for the attachments.
 */
 class RecMail
 {
 public:
     RecMail();
     RecMail(const RecMail&old);
     virtual ~RecMail();
 
     const int getNumber()const{return msg_number;}
     void setNumber(int number){msg_number=number;}
     const QString&getDate()const{ return date; }
     void setDate( const QString&a ) { date = a; }
     const QString&getFrom()const{ return from; }
     void setFrom( const QString&a ) { from = a; }
     const QString&getSubject()const { return subject; }
     void setSubject( const QString&s ) { subject = s; }
     const QString&getMbox()const{return mbox;}
     void setMbox(const QString&box){mbox = box;}
     void setMsgid(const QString&id){msg_id=id;}
     const QString&Msgid()const{return msg_id;}
     void setReplyto(const QString&reply){replyto=reply;}
     const QString&Replyto()const{return replyto;}
     void setMsgsize(int size){msg_size = size;}
     const int Msgsize()const{return msg_size;}
 
 
     void setTo(const QStringList&list);
     const QStringList&To()const;
     void setCC(const QStringList&list);
     const QStringList&CC()const;
     void setBcc(const QStringList&list);
     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);
 };
 
 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:
     RecPart();
     virtual ~RecPart();
     
     const QString&Type()const;
     void setType(const QString&type);
     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;
 
     
     void setParameters(const part_plist_t&list);
     const part_plist_t&Parameters()const;
     void addParameter(const QString&key,const QString&value);
     const QString searchParamter(const QString&key)const;
     void setPositionlist(const QValueList<int>&poslist);
     const QValueList<int>& Positionlist()const;
 };
 
 class RecBody
 {
 protected:
     QString m_BodyText;
     QValueList<RecPart> m_PartsList;
     RecPart m_description;
 
 public:
     RecBody();
     virtual ~RecBody();
     void setBodytext(const QString&);
     const QString& Bodytext()const;
 
     void setDescription(const RecPart&des);
     const RecPart& Description()const;
     
     void setParts(const QValueList<RecPart>&parts);
     const QValueList<RecPart>& Parts()const;
     void addPart(const RecPart&part);
 };
 
 #endif
diff --git a/noncore/net/mail/mainwindow.cpp b/noncore/net/mail/mainwindow.cpp
index fae3e97..8e2132e 100644
--- a/noncore/net/mail/mainwindow.cpp
+++ b/noncore/net/mail/mainwindow.cpp
@@ -1,222 +1,224 @@
 #include <qlabel.h>
 #include <qvbox.h>
 #include <qheader.h>
 #include <qtimer.h>
 #include <qlayout.h>
 #include <qmessagebox.h>
 
 #include <qpe/qpeapplication.h>
 #include <qpe/resource.h>
 
 #include "defines.h"
 #include "mainwindow.h"
 #include "viewmail.h"
 #include "mailtypes.h"
 #include "mailistviewitem.h"
 
 MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags )
     : QMainWindow( parent, name, flags )
 {
     setCaption( tr( "Mail" ) );
     setToolBarsMovable( false );
 
     toolBar = new QToolBar( this );
     menuBar = new QMenuBar( toolBar );
     mailMenu = new QPopupMenu( menuBar );
     menuBar->insertItem( tr( "Mail" ), mailMenu );
     settingsMenu = new QPopupMenu( menuBar );
     menuBar->insertItem( tr( "Settings" ), settingsMenu );
 
     addToolBar( toolBar );
     toolBar->setHorizontalStretchable( true );
 
     QLabel *spacer = new QLabel( toolBar );
     spacer->setBackgroundMode( QWidget::PaletteButton );
     toolBar->setStretchableWidget( spacer );
 
     composeMail = new QAction( tr( "Compose new mail" ), ICON_COMPOSEMAIL,
                                0, 0, this );
     composeMail->addTo( toolBar );
     composeMail->addTo( mailMenu );
 
     sendQueued = new QAction( tr( "Send queued mails" ), ICON_SENDQUEUED,
                               0, 0, this );
     sendQueued->addTo( toolBar );
     sendQueued->addTo( mailMenu );
 
     syncFolders = new QAction( tr( "Sync mailfolders" ), ICON_SYNC,
                                0, 0, this );
     syncFolders->addTo( toolBar );
     syncFolders->addTo( mailMenu );
 
     showFolders = new QAction( tr( "Show/Hide folders" ), ICON_SHOWFOLDERS,
                                0, 0, this, 0, true );
     showFolders->addTo( toolBar );
     showFolders->addTo( mailMenu );
     showFolders->setOn( true );
     connect(showFolders, SIGNAL( toggled( bool ) ),
             SLOT( slotShowFolders( bool ) ) );
 
     searchMails = new QAction( tr( "Search mails" ), ICON_SEARCHMAILS,
                                0, 0, this );
     searchMails->addTo( toolBar );
     searchMails->addTo( mailMenu );
 
     deleteMails = new QAction(tr("Delete Mail"), QIconSet(Resource::loadPixmap("mail/delete")), 0, 0, this);
     deleteMails->addTo( toolBar );
     deleteMails->addTo( mailMenu );
     connect( deleteMails, SIGNAL( activated() ),
              SLOT( slotDeleteMail() ) );
 
     editSettings = new QAction( tr( "Edit settings" ), ICON_EDITSETTINGS,
                                 0, 0, this );
     editSettings->addTo( settingsMenu );
 
     editAccounts = new QAction( tr( "Configure accounts" ), ICON_EDITACCOUNTS,
                                 0, 0, this );
     editAccounts->addTo( settingsMenu );
 
     QWidget *view = new QWidget(  this );
     setCentralWidget( view );
 
     layout = new QBoxLayout ( view, QBoxLayout::LeftToRight );
 
     folderView = new AccountView( view );
     folderView->header()->hide();
     folderView->setRootIsDecorated( true );
     folderView->addColumn( tr( "Mailbox" ) );
     //folderView->hide();
 
     layout->addWidget( folderView );
 
     mailView = new QListView( view );
     mailView->addColumn( tr( "" ) );
     mailView->addColumn( tr( "Subject" ),QListView::Manual );
     mailView->addColumn( tr( "Sender" ),QListView::Manual );
     mailView->addColumn( tr( "Date" ));
     mailView->setAllColumnsShowFocus(true);
     mailView->setSorting(-1);
 
     layout->addWidget( mailView );
     layout->setStretchFactor( folderView, 1 );
     layout->setStretchFactor( mailView, 2 );
 
     slotAdjustLayout();
 
     connect( mailView, SIGNAL( clicked( QListViewItem * ) ),this,
              SLOT( displayMail( QListViewItem * ) ) );
 
     connect(folderView, SIGNAL(refreshMailview(QList<RecMail>*)),this,SLOT(refreshMailView(QList<RecMail>*)));
 
    QTimer::singleShot( 1000, this, SLOT( slotAdjustColumns() ) );
 
 }
 
 
 void MainWindow::slotAdjustLayout() {
 
   QWidget *d = QApplication::desktop();
 
   if ( d->width() < d->height() ) {
     layout->setDirection( QBoxLayout::TopToBottom );
     } else {
     layout->setDirection( QBoxLayout::LeftToRight );
   }
   delete d;
 }
 
 void MainWindow::slotAdjustColumns()
 {
     bool hidden = folderView->isHidden();
     if ( hidden ) folderView->show();
     folderView->setColumnWidth( 0, folderView->visibleWidth() );
     if ( hidden ) folderView->hide();
 
     mailView->setColumnWidth( 0, 10 );
     mailView->setColumnWidth( 1, mailView->visibleWidth() - 130 );
     mailView->setColumnWidth( 2, 80 );
     mailView->setColumnWidth( 3, 50 );
 }
 
 void MainWindow::slotShowFolders( bool show )
 {
    qDebug( "Show Folders" );
     if ( show && folderView->isHidden() ) {
         qDebug( "-> showing" );
         folderView->show();
     } else if ( !show && !folderView->isHidden() ) {
         qDebug( "-> hiding" );
         folderView->hide();
     }
 }
 
 void MainWindow::refreshMailView(QList<RecMail>*list)
 {
     MailListViewItem*item = 0;
     mailView->clear();
     for (unsigned int i = 0; i < list->count();++i) {
         item = new MailListViewItem(mailView,item);
         item->storeData(*(list->at(i)));
         item->showEntry();
     }
 }
 void MainWindow::displayMail(QListViewItem*item)
 {
 
     if (!item) return;
     RecMail mail = ((MailListViewItem*)item)->data();
     RecBody body = folderView->fetchBody(mail);
 
     ViewMail readMail( this );
     readMail.setBody( body );
     readMail.setMail( mail );
     readMail.showMaximized();
     readMail.exec();
 
     if (  readMail.deleted ) {
          folderView->refreshCurrent();
     } else {
         ( (MailListViewItem*)item )->setPixmap( 0, Resource::loadPixmap( "opiemail/kmmsgunseen") );
     }
 }
 
 void MainWindow::slotDeleteMail()
 {
     if (!mailView->currentItem()) return;
     RecMail mail = ((MailListViewItem*)mailView->currentItem() )->data();
     if ( QMessageBox::warning(this, tr("Delete Mail"), QString( tr("<p>Do you really want to delete this mail? <br><br>" ) + mail.getFrom() + " - " + mail.getSubject() ) , QMessageBox::Yes, QMessageBox::No ) == QMessageBox::Yes ) {
        mail.Wrapper()->deleteMail( mail );
        folderView->refreshCurrent();
     }
 }
 
 
 
 MailListViewItem::MailListViewItem(QListView * parent, MailListViewItem * item )
         :QListViewItem(parent,item),mail_data()
 {
 }
 
 void MailListViewItem::showEntry()
 {
-    if ( mail_data.getFlags().testBit( FLAG_SEEN ) == true )  {
+    if ( mail_data.getFlags().testBit( FLAG_ANSWERED ) == true) {
+        setPixmap( 0, Resource::loadPixmap( "opiemail/kmmsgreplied") );
+    } else if ( mail_data.getFlags().testBit( FLAG_SEEN ) == true )  {
         setPixmap( 0, Resource::loadPixmap( "opiemail/kmmsgunseen") );
     } else  {
         setPixmap( 0, Resource::loadPixmap( "opiemail/kmmsgnew") );
     }
     setText(1,mail_data.getSubject());
     setText(2,mail_data.getFrom());
     setText(3,mail_data.getDate());
 }
 
 void MailListViewItem::storeData(const RecMail&data)
 {
     mail_data = data;
 }
 
 const RecMail& MailListViewItem::data()const
 {
     return mail_data;
 }
 
 
diff --git a/noncore/net/mail/viewmail.cpp b/noncore/net/mail/viewmail.cpp
index 68d3c51..48b71eb 100644
--- a/noncore/net/mail/viewmail.cpp
+++ b/noncore/net/mail/viewmail.cpp
@@ -1,330 +1,338 @@
 #include <qtextbrowser.h>
 #include <qmessagebox.h>
 #include <qtextstream.h>
 #include <qaction.h>
 #include <qpopupmenu.h>
 #include <qapplication.h>
 
 #include <opie/ofiledialog.h>
 
 #include "settings.h"
 #include "composemail.h"
 #include "viewmail.h"
 #include "abstractmail.h"
 #include "accountview.h"
 
-AttachItem::AttachItem(QListView * parent,QListViewItem *after, const QString&mime,const QString&file,const QString&desc,int num)
+AttachItem::AttachItem(QListView * parent,QListViewItem *after, const QString&mime,const QString&desc,const QString&file,
+    const QString&fsize,int num)
         : QListViewItem(parent,after),_partNum(num)
 {
         setText(0, mime);
-        setText(1, file);
-        setText(2, desc);
+        setText(1, desc);
+        setText(2, file);
+    setText(3, fsize);
 }
 
 void ViewMail::setBody( RecBody 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) {
     return;
 }
 AttachItem * curItem=0;
 QString type=body.Description().Type()+"/"+body.Description().Subtype();
-QString desc;
+QString desc,fsize;
 double s = body.Description().Size();
 int w;
 w=0;
 
 while (s>1024) {
     s/=1024;
     ++w;
     if (w>=2) break;
 }
 
 QString q="";
 switch(w) {
 case 1:
     q="k";
     break;
 case 2:
     q="M";
     break;
 default:
     break;
 }
 
 {
     /* I did not found a method to make a CONTENT reset on a QTextStream
        so I use this construct that the stream will re-constructed in each
        loop. To let it work, the textstream is packed into a own area of
        code is it will be destructed after finishing its small job.
     */
-    QTextOStream o(&desc);
+    QTextOStream o(&fsize);
     if (w>0) o.precision(2); else o.precision(0);
     o.setf(QTextStream::fixed);
     o << s << " " << q << "Byte";
 }
 
-curItem=new AttachItem(attachments,curItem,type,"Mailbody",desc,-1);
+curItem=new AttachItem(attachments,curItem,type,"Mailbody","",fsize,-1);
 QString filename = "";
 for (unsigned int i = 0; i < body.Parts().count();++i) {
     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") {
             filename=it.data();
         }
     }
     s = body.Parts()[i].Size();
     w = 0;
     while (s>1024) {
         s/=1024;
         ++w;
         if (w>=2) break;
     }
     switch(w) {
     case 1:
         q="k";
         break;
     case 2:
         q="M";
         break;
     default:
         q="";
         break;
     }
-    QTextOStream o(&desc);
+    QTextOStream o(&fsize);
     if (w>0) o.precision(2); else o.precision(0);
     o.setf(QTextStream::fixed);
     o << s << " " << q << "Byte";
-    curItem=new AttachItem(attachments,curItem,type,filename,desc,i);
+    desc = body.Parts()[i].Description();
+    curItem=new AttachItem(attachments,curItem,type,desc,filename,fsize,i);
 }
 }
 
-void ViewMail::slotItemClicked( QListViewItem * item , const QPoint & point, int c ) {
+void ViewMail::slotItemClicked( QListViewItem * item , const QPoint & point, int ) {
     if (!item )
         return;
 
-  QPopupMenu *menu = new QPopupMenu();
+    if (  ( ( AttachItem* )item )->Partnumber() == -1 ) {
+        setText();
+        return;
+    }
+    QPopupMenu *menu = new QPopupMenu();
   int ret=0;
 
-  if ( item->text( 0 ).left( 4 ) == "text" )  {
+  if ( item->text( 0 ).left( 5 ) == "text/" )  {
      menu->insertItem( tr( "Show Text" ), 1 );
   }
   menu->insertItem( tr( "Save Attachment" ),  0 );
   menu->insertSeparator(1);
 
   ret = menu->exec( point, 0 );
 
   switch(ret) {
         case 0:
              { MimeTypes types;
              types.insert( "all", "*" );
              QString str = OFileDialog::getSaveFileName( 1,
-                  "/", item->text( 1 )  , types, 0 );
+                  "/", item->text( 2 )  , types, 0 );
 
              if( !str.isEmpty() ) {
                qDebug( "first we will need a MIME wrapper" );
              }
              }
         break ;
 
         case 1:
              if (  ( ( AttachItem* )item )->Partnumber() == -1 ) {
                 setText();
              } else {
                 if (  m_recMail.Wrapper() != 0l )  { // make sure that there is a wrapper , even after delete or simular actions
                 browser->setText( m_recMail.Wrapper()->fetchPart( m_recMail, m_body.Parts()[ ( ( AttachItem* )item )->Partnumber() ] ) );
                 }
              }
         break;
  }
  delete menu;
 }
 
 
 void ViewMail::setMail( RecMail mail ) {
 
 m_recMail = mail;
 
 m_mail[0] = mail.getFrom();
 m_mail[1] = mail.getSubject();
 m_mail[3] = mail.getDate();
 m_mail[4] = mail.Msgid();
 
 m_mail2[0] = mail.To();
 m_mail2[1] = mail.CC();
 m_mail2[2] = mail.Bcc();
 
 setText();
 }
 
 
 
 ViewMail::ViewMail( QWidget *parent, const char *name, WFlags fl)
         : ViewMailBase(parent, name, fl), _inLoop(false)
 {
         m_gotBody = false;
 
         connect(reply, SIGNAL(activated()), SLOT(slotReply()));
         connect(forward, SIGNAL(activated()), SLOT(slotForward()));
         connect( deleteMail, SIGNAL( activated() ),  SLOT( slotDeleteMail(  ) ) );
 
         attachments->setEnabled(m_gotBody);
         connect( attachments,  SIGNAL( clicked ( QListViewItem *, const QPoint & , int ) ), SLOT( slotItemClicked(  QListViewItem *,  const QPoint & , int ) ) );
 
 }
 
 void ViewMail::setText()
 {
 
   QString toString;
   QString ccString;
   QString bccString;
 
   for ( QStringList::Iterator it = ( m_mail2[0] ).begin(); it != ( m_mail2[0] ).end(); ++it ) {
                   toString += (*it);
   }
   for ( QStringList::Iterator it = ( m_mail2[1] ).begin(); it != ( m_mail2[1] ).end(); ++it ) {
                   ccString += (*it);
   }
   for ( QStringList::Iterator it = ( m_mail2[2] ).begin(); it != ( m_mail2[2] ).end(); ++it ) {
                   bccString += (*it);
   }
 
  setCaption( caption().arg( m_mail[0] ) );
 
      m_mailHtml = "<html><body>"
                   "<table width=\"100%\" border=\"0\"><tr bgcolor=\"#FFDD76\"><td>"
                   "<div align=left><b>" + deHtml( m_mail[1] ) + "</b></div>"
                   "</td></tr><tr bgcolor=\"#EEEEE6\"><td>"
                          "<b>" + tr( "From" ) + ": </b><font color=#6C86C0>" + deHtml( m_mail[0] ) + "</font><br>"
                   "<b>" + tr(  "To" ) + ": </b><font color=#6C86C0>" + deHtml( toString ) + "</font><br><b>" +
                   tr( "Cc" ) + ": </b>" + deHtml( ccString ) + "<br>"
                       "<b>" + tr( "Date" ) + ": </b> " +  m_mail[3] +
                   "</td></tr></table><font face=fixed>";
 
         browser->setText( QString( m_mailHtml) + deHtml( m_mail[2] ) + "</font></html>" );
         // remove later in favor of a real handling
         m_gotBody = true;
 }
 
 
 ViewMail::~ViewMail()
 {
         hide();
 }
 
 void ViewMail::hide()
 {
         QWidget::hide();
 
         if (_inLoop) {
                 _inLoop = false;
                 qApp->exit_loop();
 
         }
 
 }
 
 void ViewMail::exec()
 {
         show();
 
         if (!_inLoop) {
                 _inLoop = true;
                 qApp->enter_loop();
         }
 
 }
 
 QString ViewMail::deHtml(const QString &string)
 {
         QString string_ = string;
         string_.replace(QRegExp("&"), "&amp;");
         string_.replace(QRegExp("<"), "&lt;");
         string_.replace(QRegExp(">"), "&gt;");
         string_.replace(QRegExp("\\n"), "<br>");
         return string_;
 }
 
 void ViewMail::slotReply()
 {
         if (!m_gotBody) {
                 QMessageBox::information(this, tr("Error"), tr("<p>The mail body is not yet downloaded, so you cannot reply yet."), tr("Ok"));
                 return;
         }
 
         QString rtext;
                 rtext += QString("* %1 wrote on %2:\n")         // no i18n on purpose
                 .arg(  m_mail[0] )
                 .arg( m_mail[3] );
 
         QString text = m_mail[2];
         QStringList lines = QStringList::split(QRegExp("\\n"), text);
         QStringList::Iterator it;
         for (it = lines.begin(); it != lines.end(); it++) {
                 rtext += "> " + *it + "\n";
         }
         rtext += "\n";
 
         QString prefix;
         if ( m_mail[1].find(QRegExp("^Re: *$")) != -1) prefix = "";
                 else prefix = "Re: ";                   // no i18n on purpose
 
         Settings *settings = new Settings();
         ComposeMail composer( settings ,this, 0, true);
         composer.setTo( m_mail[0] );
         composer.setSubject( "Re: " + m_mail[1] );
         composer.setMessage( rtext );
         composer.showMaximized();
     if ( QDialog::Accepted==composer.exec()) {
         m_recMail.Wrapper()->answeredMail(m_recMail);
     }
 }
 
 void ViewMail::slotForward()
 {
         if (!m_gotBody) {
                 QMessageBox::information(this, tr("Error"), tr("<p>The mail body is not yet downloaded, so you cannot forward yet."), tr("Ok"));
                 return;
         }
 
         QString ftext;
         ftext += QString("\n----- Forwarded message from %1 -----\n\n")
                 .arg( m_mail[0] );
         if (!m_mail[3].isNull())
                  ftext += QString("Date: %1\n")
                          .arg( m_mail[3] );
         if (!m_mail[0].isNull())
                  ftext += QString("From: %1\n")
                          .arg( m_mail[0] );
         if (!m_mail[1].isNull())
                  ftext += QString("Subject: %1\n")
                          .arg( m_mail[1] );
 
         ftext += QString("\n%1\n")
                  .arg( m_mail[2]);
 
         ftext += QString("----- End forwarded message -----\n");
 
         Settings *settings = new Settings();
         ComposeMail composer( settings ,this, 0, true);
         composer.setSubject( "Fwd: " + m_mail[1] );
         composer.setMessage( ftext );
         composer.showMaximized();
     if ( QDialog::Accepted==composer.exec()) {
         
     }
 }
 
 void ViewMail::slotDeleteMail( )
 {
     if ( QMessageBox::warning(this, tr("Delete Mail"), QString( tr("<p>Do you really want to delete this mail? <br><br>" ) + m_mail[0] + " - " + m_mail[1] ) , QMessageBox::Yes, QMessageBox::No ) == QMessageBox::Yes ) {
         m_recMail.Wrapper()->deleteMail( m_recMail );
         hide();
         deleted = true;
     }
 }
diff --git a/noncore/net/mail/viewmail.h b/noncore/net/mail/viewmail.h
index 765464c..dd7f854 100644
--- a/noncore/net/mail/viewmail.h
+++ b/noncore/net/mail/viewmail.h
@@ -1,60 +1,61 @@
 #ifndef VIEWMAIL_H
 #define VIEWMAIL_H
 
 #include <qlistview.h>
 #include <qmap.h>
 #include <qstringlist.h>
 
 #include "viewmailbase.h"
 #include "mailtypes.h"
 
 class AttachItem : public QListViewItem
 {
 public:
-    AttachItem(QListView * parent,QListViewItem *after, const QString&mime,const QString&file,const QString&desc,int num);
+    AttachItem(QListView * parent,QListViewItem *after, const QString&mime,const QString&desc,const QString&file,
+        const QString&fsize,int num);
     int Partnumber() { return _partNum; }
 
 private:
     int _partNum;
 };
 
 class ViewMail : public ViewMailBase
 {
         Q_OBJECT
 
 public:
         ViewMail(  QWidget *parent = 0, const char *name = 0, WFlags fl = Qt::WType_Modal);
         ~ViewMail();
 
         void hide();
         void exec();
         void setMail( RecMail mail );
         void setBody( RecBody body );
         bool deleted;
 
 protected:
         QString deHtml(const QString &string);
 
 protected slots:
         void slotReply();
         void slotForward();
         void setText();
         void slotItemClicked( QListViewItem * item , const QPoint & point, int c );
         void slotDeleteMail( );
 
 
 private:
         bool _inLoop;
         QString m_mailHtml;
         bool m_gotBody;
         RecBody m_body;
         RecMail m_recMail;
 
         // 0 from  1 subject  2 bodytext 3 date
         QMap <int,QString>  m_mail;
         // 0 to 1 cc 2 bcc
         QMap <int,QStringList> m_mail2;
 
 };
 
 #endif
diff --git a/noncore/net/mail/viewmailbase.cpp b/noncore/net/mail/viewmailbase.cpp
index 38f92b4..0c7f671 100644
--- a/noncore/net/mail/viewmailbase.cpp
+++ b/noncore/net/mail/viewmailbase.cpp
@@ -1,76 +1,77 @@
 #include <qtextbrowser.h>
 #include <qlistview.h>
 #include <qaction.h>
 #include <qlabel.h>
 #include <qvbox.h>
 #include <qpopupmenu.h>
 
 #include <qpe/qpetoolbar.h>
 #include <qmenubar.h>
 #include <qpe/resource.h>
 
 #include "viewmailbase.h"
 //#include "opendiag.h"
 
 ViewMailBase::ViewMailBase(QWidget *parent, const char *name, WFlags fl)
         : QMainWindow(parent, name, fl)
 {
         setCaption(tr("E-Mail by %1"));
         setToolBarsMovable(false);
 
         toolbar = new QToolBar(this);
   menubar = new QMenuBar( toolbar );
   mailmenu = new QPopupMenu( menubar );
   menubar->insertItem( tr( "Mail" ), mailmenu );
 
         toolbar->setHorizontalStretchable(true);
         addToolBar(toolbar);
 
         QLabel *spacer = new QLabel(toolbar);
         spacer->setBackgroundMode(QWidget::PaletteButton);
         toolbar->setStretchableWidget(spacer);
 
         reply = new QAction(tr("Reply"), QIconSet(Resource::loadPixmap("mail/reply")), 0, 0, this);
         reply->addTo(toolbar);
          reply->addTo(mailmenu);
 
         forward = new QAction(tr("Forward"), QIconSet(Resource::loadPixmap("mail/forward")), 0, 0, this);
         forward->addTo(toolbar);
         forward->addTo(mailmenu);
 
         attachbutton = new QAction(tr("Attachments"), QIconSet(Resource::loadPixmap("mail/attach")), 0, 0, this, 0, true);
         attachbutton->addTo(toolbar);
         attachbutton->addTo(mailmenu);
         connect(attachbutton, SIGNAL(toggled(bool)), SLOT(slotChangeAttachview(bool)));
 
         deleteMail = new QAction(tr("Delete Mail"), QIconSet(Resource::loadPixmap("mail/delete")), 0, 0, this);
         deleteMail->addTo(toolbar);
         deleteMail->addTo(mailmenu);
 
         QVBox *view = new QVBox(this);
         setCentralWidget(view);
 
         attachments = new QListView(view);
         attachments->setMinimumHeight(90);
         attachments->setMaximumHeight(90);
         attachments->setAllColumnsShowFocus(true);
         attachments->addColumn("Mime Type", 60);
-        attachments->addColumn(tr("Filename"), 100);
-        attachments->addColumn(tr("Size"), 80);
+        attachments->addColumn(tr("Description"), 100);
+        attachments->addColumn(tr("Filename"), 80);
+    attachments->addColumn(tr("Size"), 80);
     attachments->setSorting(-1);
         attachments->hide();
 
         browser = new QTextBrowser(view);
 
         //openDiag = new OpenDiag(view);
         //openDiag->hide();
 
 }
 
 void ViewMailBase::slotChangeAttachview(bool state)
 {
         if (state) attachments->show();
         else attachments->hide();
 }