1 files changed, 21 insertions, 1 deletions

diff --git a/kmicromail/accountitem.cpp b/kmicromail/accountitem.cpp
index 1698b40..7b9b881 100644
--- a/kmicromail/accountitem.cpp
+++ b/kmicromail/accountitem.cpp
@@ -83,29 +83,30 @@ RECBODYP POP3viewItem::fetchBody( const RecMailP &mail )
     return wrapper->fetchBody( mail );
 }
 
 QPopupMenu * POP3viewItem::getContextMenu()
 {
     QPopupMenu *m = new QPopupMenu(0);
     if (m)
     {
         if (!account->getOffline())
         {
             m->insertItem(QObject::tr("Disconnect",contextName),0);
             m->insertItem(QObject::tr("Set offline",contextName),1);
-            m->insertItem(QObject::tr("Download messages",contextName),2);
+            m->insertItem(QObject::tr("Download new INBOX messages",contextName),2);
         }
         else
         {
             m->insertItem(QObject::tr("Set online",contextName),1);
+            m->insertItem(QObject::tr("Download new INBOX messages",contextName),2);
         }
     }
     return m;
 }
 
 void POP3viewItem::disconnect()
 {
     QListViewItem *child = firstChild();
     while ( child )
     {
         QListViewItem *tmp = child;
         child = child->nextSibling();
@@ -128,24 +129,26 @@ void POP3viewItem::setOnOffline()
 
 void POP3viewItem::contextMenuSelected(int which)
 {
     switch (which)
     {
     case 0:
         disconnect();
         break;
     case 1:
         setOnOffline();
         break;
     case 2: // daunlood 
+        if (account->getOffline())
+            setOnOffline();
         AccountView*bl = accountView();
         if (!bl) return;
         AccountViewItem* in = findSubItem( "inbox" , 0);
         if ( ! in )
             return;
         bl->downloadMailsInbox(in->getFolder() ,getWrapper());
         setOnOffline();
         break;
     }
 }
 
 POP3folderItem::~POP3folderItem()
@@ -504,28 +507,32 @@ void IMAPviewItem::refreshFolders(bool force)
 QPopupMenu * IMAPviewItem::getContextMenu()
 {
     QPopupMenu *m = new QPopupMenu(0);
     if (m)
     {
         if (!account->getOffline())
         {
             m->insertItem(QObject::tr("Refresh folder list",contextName),0);
             m->insertItem(QObject::tr("Create new folder",contextName),1);
             m->insertSeparator();
             m->insertItem(QObject::tr("Disconnect",contextName),2);
             m->insertItem(QObject::tr("Set offline",contextName),3);
+            m->insertSeparator();
+            m->insertItem(QObject::tr("Download new INBOX messages",contextName),4);
         }
         else
         {
             m->insertItem(QObject::tr("Set online",contextName),3);
+            m->insertSeparator();
+            m->insertItem(QObject::tr("Download new INBOX messages",contextName),4);
         }
     }
     return m;
 }
 
 void IMAPviewItem::createNewFolder()
 {
     Newmdirdlg ndirdlg;
 
     ndirdlg.showMaximized();
     if ( ndirdlg.exec() )
     {
@@ -561,24 +568,37 @@ void IMAPviewItem::contextMenuSelected(int id)
         break;
     case 3:
         if (account->getOffline()==false)
         {
             removeChilds();
             wrapper->logout();
         }
         account->setOffline(!account->getOffline());
         account->save();
         SETPIX(PIXMAP_IMAPFOLDER);
         refreshFolders(false);
         break;
+    case 4: // daunlood 
+        {
+            if (account->getOffline()) {
+                contextMenuSelected( 3 );
+            }
+        AccountView*bl = accountView();
+        if (!bl) return;
+        AccountViewItem* in = findSubItem( "inbox" , 0);
+        if ( ! in )
+            return;
+        bl->downloadMailsInbox(in->getFolder(),getWrapper());
+        }
+        break;
     default:
         break;
     }
 }
 
 RECBODYP IMAPviewItem::fetchBody(const RecMailP&)
 {
     return new RecBody();
 }
 
 bool IMAPviewItem::offline()
 {