2 files changed, 15 insertions, 0 deletions

diff --git a/noncore/net/mail/viewmail.cpp b/noncore/net/mail/viewmail.cpp
index d4c5150..ed77eb5 100644
--- a/noncore/net/mail/viewmail.cpp
+++ b/noncore/net/mail/viewmail.cpp
@@ -33,64 +33,76 @@ AttachItem::AttachItem(QListViewItem * parent,QListViewItem *after, const QStrin
     const QString&fsize,int num,const QValueList<int>&path)
 	: QListViewItem(parent,after),_partNum(num)
 {
     _path=path;
 	setText(0, mime);
 	setText(1, desc);
 	setText(2, file);
     setText(3, fsize);
 }
 
 bool AttachItem::isParentof(const QValueList<int>&path)
 {
     /* if not set, then no parent */
     if (path.count()==0||_path.count()==0) return false;
     /* the parent must have one digit less then a child */
     if (path.count()!=_path.count()+1) return false;
     for (unsigned int i=0; i < _path.count();++i) {
         if (_path[i]!=path[i]) return false;
     }
     return true;
 }
 
 AttachItem* ViewMail::searchParent(const QValueList<int>&path)
 {
     QListViewItemIterator it( attachments );
     for ( ; it.current(); ++it ) {
         AttachItem*ati = (AttachItem*)it.current();
         if (ati->isParentof(path)) return ati;
     }
     return 0;
 }
 
+AttachItem* ViewMail::lastChild(AttachItem*parent)
+{
+    if (!parent) return 0;
+    AttachItem* item = (AttachItem*)parent->firstChild();
+    if (!item) return item;
+    AttachItem*temp=0;
+    while( (temp=(AttachItem*)item->nextSibling())) {
+        item = temp;
+    }
+    return item;
+}
+
 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;
 AttachItem * parentItem = 0;
 QString type=body.Description().Type()+"/"+body.Description().Subtype();
 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:
@@ -117,64 +129,66 @@ for (unsigned int i = 0; i < body.Parts().count();++i) {
     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(&fsize);
     if (w>0) o.precision(2); else o.precision(0);
     o.setf(QTextStream::fixed);
     o << s << " " << q << "Byte";
     desc = body.Parts()[i].Description();
     parentItem = searchParent(body.Parts()[i].Positionlist());
     if (parentItem) {
+        AttachItem*temp = lastChild(parentItem);
+        if (temp) curItem = temp;
         curItem=new AttachItem(parentItem,curItem,type,desc,filename,fsize,i,body.Parts()[i].Positionlist());
         attachments->setRootIsDecorated(true);
         curItem = parentItem;
     } else {
         curItem=new AttachItem(attachments,curItem,type,desc,filename,fsize,i,body.Parts()[i].Positionlist());
     }
 }
 }
 
 
 void ViewMail::slotShowHtml( bool state ) {
     m_showHtml = state;
     setText();
 }
 
 void ViewMail::slotItemClicked( QListViewItem * item , const QPoint & point, int ) {
     if (!item )
         return;
 
     if (  ( ( AttachItem* )item )->Partnumber() == -1 ) {
         setText();
         return;
     }
     QPopupMenu *menu = new QPopupMenu();
   int ret=0;
 
   if ( item->text( 0 ).left( 5 ) == "text/" || item->text(0)=="message/rfc822" )  {
      menu->insertItem( tr( "Show Text" ), 1 );
   }
   menu->insertItem( tr( "Save Attachment" ),  0 );
   menu->insertSeparator(1);
 
diff --git a/noncore/net/mail/viewmail.h b/noncore/net/mail/viewmail.h
index b3d3b4e..29681cc 100644
--- a/noncore/net/mail/viewmail.h
+++ b/noncore/net/mail/viewmail.h
@@ -13,59 +13,60 @@ class AttachItem : public QListViewItem
 {
 public:
     AttachItem(QListView * parent,QListViewItem *after, const QString&mime,const QString&desc,const QString&file,
         const QString&fsize,int num,const QValueList<int>&path);
     AttachItem(QListViewItem * parent,QListViewItem *after, const QString&mime,const QString&desc,const QString&file,
         const QString&fsize,int num,const QValueList<int>&path);
     int Partnumber() { return _partNum; }
     bool isParentof(const QValueList<int>&path);
 
 private:
     int _partNum;
     /* needed for a better display of attachments */
     QValueList<int> _path;
 };
 
 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);
     AttachItem* searchParent(const QValueList<int>&path);
+    AttachItem* lastChild(AttachItem*parent);
 
 protected slots:
 	void slotReply();
 	void slotForward();
         void setText();
         void slotItemClicked( QListViewItem * item , const QPoint & point, int c );
         void slotDeleteMail( );
 	void slotShowHtml( bool );
 
 private:
 	void readConfig();
 	
 	bool _inLoop;
 	QString m_mailHtml;
 	bool m_gotBody;
         RecBody m_body;
         RecMail m_recMail;
 	bool m_showHtml;
 
         // 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