More config changes

8 files changed, 372 insertions, 88 deletions

diff --git a/kmicromail/accountitem.cpp b/kmicromail/accountitem.cpp
index d0321ef..1698b40 100644
--- a/kmicromail/accountitem.cpp
+++ b/kmicromail/accountitem.cpp
@@ -83,24 +83,25 @@ 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);
         }
         else
         {
             m->insertItem(QObject::tr("Set online",contextName),1);
         }
     }
     return m;
 }
 
 void POP3viewItem::disconnect()
 {
     QListViewItem *child = firstChild();
@@ -126,24 +127,33 @@ void POP3viewItem::setOnOffline()
 }
 
 void POP3viewItem::contextMenuSelected(int which)
 {
     switch (which)
     {
     case 0:
         disconnect();
         break;
     case 1:
         setOnOffline();
         break;
+    case 2: // daunlood 
+        AccountView*bl = accountView();
+        if (!bl) return;
+        AccountViewItem* in = findSubItem( "inbox" , 0);
+        if ( ! in )
+            return;
+        bl->downloadMailsInbox(in->getFolder() ,getWrapper());
+        setOnOffline();
+        break;
     }
 }
 
 POP3folderItem::~POP3folderItem()
 {}
 
 POP3folderItem::POP3folderItem( const FolderP&folderInit, POP3viewItem *parent , QListViewItem*after  )
         : AccountViewItem(folderInit,parent,after )
 {
     pop3 = parent;
     if (folder->getDisplayName().lower()!="inbox")
     {
@@ -1096,25 +1106,25 @@ void AccountViewItem::removeChilds()
     QListViewItem *child = firstChild();
     while ( child )
     {
         QListViewItem *tmp = child;
         child = child->nextSibling();
         delete tmp;
     }
 }
 
 bool AccountViewItem::matchName(const QString&name)const
 {
     if (!folder) return false;
-    return folder->getDisplayName()==name;
+    return folder->getDisplayName().lower()==name.lower();
 }
 
 
 AccountViewItem*AccountViewItem::findSubItem(const QString&path,AccountViewItem*start)
 {
     AccountViewItem*pitem,*sitem;
     if (!start) pitem = (AccountViewItem*)firstChild();
     else pitem = (AccountViewItem*)start->firstChild();
     while (pitem)
     {
         if (pitem->matchName(path))
         {
diff --git a/kmicromail/accountitem.h b/kmicromail/accountitem.h
index f125eeb..faf919d 100644
--- a/kmicromail/accountitem.h
+++ b/kmicromail/accountitem.h
@@ -27,24 +27,25 @@ public:
     AccountViewItem( QListViewItem *parent);
     AccountViewItem( QListViewItem *parent , QListViewItem*after  );
     AccountViewItem( const Opie::Core::OSmartPointer<Folder>&folderInit,QListViewItem *parent , QListViewItem*after  );
 
     virtual ~AccountViewItem();
     virtual void refresh(QValueList<Opie::Core::OSmartPointer<RecMail> >&)=0;
     virtual RECBODYP fetchBody(const Opie::Core::OSmartPointer<RecMail>&)=0;
     virtual QPopupMenu * getContextMenu(){return 0;};
     virtual void contextMenuSelected(int){}
     virtual AccountView*accountView();
     virtual bool matchName(const QString&name)const;
     virtual bool isDraftfolder();
+    Opie::Core::OSmartPointer<Folder> getFolder() { return folder; };
 
 protected:
     AccountViewItem*findSubItem(const QString&path,AccountViewItem*start=0);
     virtual void init();
     virtual void removeChilds();
     virtual void deleteAllMail(AbstractMail*wrapper,const Opie::Core::OSmartPointer<Folder>&f);
     static const QString contextName;
     AccountView*m_Backlink;
     Opie::Core::OSmartPointer<Folder> folder;
 };
 
 class POP3viewItem : public AccountViewItem
diff --git a/kmicromail/accountview.cpp b/kmicromail/accountview.cpp
index 4ead545..85523b1 100644
--- a/kmicromail/accountview.cpp
+++ b/kmicromail/accountview.cpp
@@ -130,24 +130,51 @@ void AccountView::setupFolderselect(Selectstore*sels)
         mhAccounts[i]->refresh(false);
         sFolders = mhAccounts[i]->subFolders();
         sels->addAccounts(mhAccounts[i]->getWrapper(),sFolders);
     }
     for (i=0; i < imapAccounts.count();++i)
     {
         if (imapAccounts[i]->offline())
             continue;
         imapAccounts[i]->refreshFolders(false);
         sels->addAccounts(imapAccounts[i]->getWrapper(),imapAccounts[i]->subFolders());
     }
 }
+void AccountView::downloadMailsInbox(const FolderP&fromFolder,AbstractMail*fromWrapper)
+{
+    AbstractMail*targetMail = 0;
+    QString targetFolder = "";
+    Selectstore sels;
+    setupFolderselect(&sels);
+    if (!sels.exec()) return;
+    targetMail = sels.currentMail();
+    targetFolder = sels.currentFolder();
+    if ( (fromWrapper==targetMail && fromFolder->getName()==targetFolder) ||
+            targetFolder.isEmpty())
+    {
+        return;
+    }
+    if (sels.newFolder() && !targetMail->createMbox(targetFolder))
+    {
+        QMessageBox::critical(0,tr("Error creating new Folder"),
+                              tr("<center>Error while creating<br>new folder - breaking.</center>"));
+        return;
+    }
+    int maxsize = 0;
+    if ( sels.useSize->isChecked()) 
+        maxsize = sels.sizeSpinBox->value();
+        
+    fromWrapper->mvcpAllMails(fromFolder,targetFolder,targetMail,sels.moveMails(),  maxsize);
+    refreshCurrent();
+}
 
 void AccountView::downloadMails(const FolderP&fromFolder,AbstractMail*fromWrapper)
 {
     AbstractMail*targetMail = 0;
     QString targetFolder = "";
     Selectstore sels;
     setupFolderselect(&sels);
     if (!sels.exec()) return;
     targetMail = sels.currentMail();
     targetFolder = sels.currentFolder();
     if ( (fromWrapper==targetMail && fromFolder->getName()==targetFolder) ||
             targetFolder.isEmpty())
diff --git a/kmicromail/accountview.h b/kmicromail/accountview.h
index 787b0b0..fcf33d1 100644
--- a/kmicromail/accountview.h
+++ b/kmicromail/accountview.h
@@ -14,24 +14,25 @@ class IMAPviewItem;
 class MHviewItem;
 
 class AccountView : public QListView
 {
     Q_OBJECT
 
 public:
     AccountView( QWidget *parent = 0, const char *name = 0, WFlags flags = 0 );
     virtual ~AccountView();
     virtual void populate( QList<Account> list );
     virtual RecBodyP fetchBody(const Opie::Core::OSmartPointer<RecMail>&aMail);
     virtual void downloadMails(const Opie::Core::OSmartPointer<Folder>&fromFolder,AbstractMail*fromWrapper);
+    virtual void downloadMailsInbox(const Opie::Core::OSmartPointer<Folder>&fromFolder,AbstractMail*fromWrapper);
     virtual bool currentisDraft();
 
 public slots:
     virtual void refreshAll();
     virtual void refresh(QListViewItem *item);
     virtual void refreshCurrent();
     virtual void slotHold(int, QListViewItem *,const QPoint&,int);
     virtual void slotContextMenu(int id);
     void setupFolderselect(Selectstore*sels);
 
 signals:
     void refreshMailview(const QValueList<RecMailP>& );
diff --git a/kmicromail/imapconfigui.ui b/kmicromail/imapconfigui.ui
index a96c1a2..2e4c9ca 100644
--- a/kmicromail/imapconfigui.ui
+++ b/kmicromail/imapconfigui.ui
@@ -2,258 +2,474 @@
 <class>IMAPconfigUI</class>
 <widget>
     <class>QDialog</class>
     <property stdset="1">
         <name>name</name>
         <cstring>IMAPconfigUI</cstring>
     </property>
     <property stdset="1">
         <name>geometry</name>
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>425</width>
-            <height>428</height>
+            <width>306</width>
+            <height>396</height>
         </rect>
     </property>
     <property stdset="1">
         <name>caption</name>
         <string>Configure IMAP</string>
     </property>
     <property>
         <name>layoutMargin</name>
     </property>
     <property>
         <name>layoutSpacing</name>
     </property>
-    <grid>
+    <vbox>
         <property stdset="1">
             <name>margin</name>
             <number>3</number>
         </property>
         <property stdset="1">
             <name>spacing</name>
-            <number>3</number>
+            <number>1</number>
         </property>
-        <widget row="2"  column="1" >
-            <class>QLineEdit</class>
+        <widget>
+            <class>QLayoutWidget</class>
             <property stdset="1">
                 <name>name</name>
-                <cstring>serverLine</cstring>
+                <cstring>Layout22</cstring>
             </property>
-        </widget>
-        <widget row="3"  column="0" >
-            <class>QLabel</class>
+            <hbox>
             <property stdset="1">
-                <name>name</name>
-                <cstring>portLabel</cstring>
+                    <name>margin</name>
+                    <number>0</number>
             </property>
             <property stdset="1">
-                <name>text</name>
-                <string>Port</string>
+                    <name>spacing</name>
+                    <number>6</number>
             </property>
-        </widget>
-        <widget row="2"  column="0" >
+                <widget>
             <class>QLabel</class>
             <property stdset="1">
                 <name>name</name>
-                <cstring>serverLabel</cstring>
+                        <cstring>accountLabel</cstring>
             </property>
             <property stdset="1">
                 <name>text</name>
-                <string>Server</string>
-            </property>
-        </widget>
-        <widget row="3"  column="1" >
-            <class>QLineEdit</class>
-            <property stdset="1">
-                <name>name</name>
-                <cstring>portLine</cstring>
+                        <string>Account</string>
             </property>
         </widget>
-        <widget row="0"  column="1" >
+                <widget>
             <class>QLineEdit</class>
             <property stdset="1">
                 <name>name</name>
                 <cstring>accountLine</cstring>
             </property>
             <property>
                 <name>toolTip</name>
                 <string>Name of the Account</string>
             </property>
         </widget>
-        <widget row="0"  column="0" >
-            <class>QLabel</class>
-            <property stdset="1">
-                <name>name</name>
-                <cstring>accountLabel</cstring>
-            </property>
-            <property stdset="1">
-                <name>text</name>
-                <string>Account</string>
-            </property>
+            </hbox>
         </widget>
-        <widget row="1"  column="0"  rowspan="1"  colspan="2" >
+        <widget>
             <class>Line</class>
             <property stdset="1">
                 <name>name</name>
                 <cstring>line1</cstring>
             </property>
             <property stdset="1">
                 <name>orientation</name>
                 <enum>Horizontal</enum>
             </property>
         </widget>
-        <spacer row="12"  column="1" >
-            <property>
+        <widget>
+            <class>QLayoutWidget</class>
+            <property stdset="1">
                 <name>name</name>
-                <cstring>spacer</cstring>
+                <cstring>Layout23</cstring>
             </property>
+            <hbox>
             <property stdset="1">
-                <name>orientation</name>
-                <enum>Vertical</enum>
+                    <name>margin</name>
+                    <number>0</number>
             </property>
             <property stdset="1">
-                <name>sizeType</name>
-                <enum>Expanding</enum>
+                    <name>spacing</name>
+                    <number>6</number>
             </property>
-            <property>
-                <name>sizeHint</name>
-                <size>
-                    <width>20</width>
-                    <height>20</height>
-                </size>
+                <widget>
+                    <class>QLabel</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>serverLabel</cstring>
             </property>
-        </spacer>
-        <widget row="8"  column="1" >
+                    <property stdset="1">
+                        <name>text</name>
+                        <string>Server</string>
+                    </property>
+                </widget>
+                <widget>
             <class>QLineEdit</class>
             <property stdset="1">
                 <name>name</name>
-                <cstring>userLine</cstring>
+                        <cstring>serverLine</cstring>
             </property>
         </widget>
-        <widget row="9"  column="1" >
-            <class>QLineEdit</class>
+            </hbox>
+        </widget>
+        <widget>
+            <class>QLayoutWidget</class>
             <property stdset="1">
                 <name>name</name>
-                <cstring>passLine</cstring>
+                <cstring>Layout24</cstring>
             </property>
+            <hbox>
             <property stdset="1">
-                <name>echoMode</name>
-                <enum>Password</enum>
+                    <name>margin</name>
+                    <number>0</number>
             </property>
-        </widget>
-        <widget row="11"  column="0" >
+                <property stdset="1">
+                    <name>spacing</name>
+                    <number>6</number>
+                </property>
+                <widget>
             <class>QLabel</class>
             <property stdset="1">
                 <name>name</name>
-                <cstring>prefixLabel</cstring>
+                        <cstring>portLabel</cstring>
             </property>
             <property stdset="1">
                 <name>text</name>
-                <string>Prefix</string>
+                        <string>Port</string>
             </property>
         </widget>
-        <widget row="11"  column="1" >
+                <widget>
             <class>QLineEdit</class>
             <property stdset="1">
                 <name>name</name>
-                <cstring>prefixLine</cstring>
+                        <cstring>portLine</cstring>
             </property>
         </widget>
-        <widget row="8"  column="0" >
+            </hbox>
+        </widget>
+        <widget>
+            <class>QLayoutWidget</class>
+            <property stdset="1">
+                <name>name</name>
+                <cstring>Layout16</cstring>
+            </property>
+            <vbox>
+                <property stdset="1">
+                    <name>margin</name>
+                    <number>0</number>
+                </property>
+                <property stdset="1">
+                    <name>spacing</name>
+                    <number>6</number>
+                </property>
+                <widget>
             <class>QLabel</class>
             <property stdset="1">
                 <name>name</name>
-                <cstring>userLabel</cstring>
+                        <cstring>TextLabel1</cstring>
             </property>
             <property stdset="1">
                 <name>text</name>
-                <string>User</string>
+                        <string>Use secure sockets:</string>
+                    </property>
+                </widget>
+                <widget>
+                    <class>QComboBox</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>ComboBox1</cstring>
+                    </property>
+                </widget>
+                <widget>
+                    <class>QLineEdit</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>CommandEdit</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>text</name>
+                        <string>ssh $SERVER exec</string>
             </property>
         </widget>
-        <widget row="7"  column="0"  rowspan="1"  colspan="2" >
+            </vbox>
+        </widget>
+        <widget>
             <class>Line</class>
             <property stdset="1">
                 <name>name</name>
                 <cstring>line2</cstring>
             </property>
             <property stdset="1">
                 <name>enabled</name>
                 <bool>true</bool>
             </property>
             <property stdset="1">
                 <name>caption</name>
                 <string></string>
             </property>
             <property stdset="1">
                 <name>orientation</name>
                 <enum>Horizontal</enum>
             </property>
             <property>
                 <name>layoutMargin</name>
             </property>
             <property>
                 <name>layoutSpacing</name>
             </property>
         </widget>
-        <widget row="10"  column="0"  rowspan="1"  colspan="2" >
+        <widget>
+            <class>QLayoutWidget</class>
+            <property stdset="1">
+                <name>name</name>
+                <cstring>Layout25</cstring>
+            </property>
+            <hbox>
+                <property stdset="1">
+                    <name>margin</name>
+                    <number>0</number>
+                </property>
+                <property stdset="1">
+                    <name>spacing</name>
+                    <number>6</number>
+                </property>
+                <widget>
+                    <class>QLabel</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>userLabel</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>text</name>
+                        <string>User</string>
+                    </property>
+                </widget>
+                <widget>
+                    <class>QLineEdit</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>userLine</cstring>
+                    </property>
+                </widget>
+            </hbox>
+        </widget>
+        <widget>
+            <class>QLayoutWidget</class>
+            <property stdset="1">
+                <name>name</name>
+                <cstring>Layout26</cstring>
+            </property>
+            <hbox>
+                <property stdset="1">
+                    <name>margin</name>
+                    <number>0</number>
+                </property>
+                <property stdset="1">
+                    <name>spacing</name>
+                    <number>6</number>
+                </property>
+                <widget>
+                    <class>QLabel</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>passLabel</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>text</name>
+                        <string>Password</string>
+                    </property>
+                </widget>
+                <widget>
+                    <class>QLineEdit</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>passLine</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>echoMode</name>
+                        <enum>Password</enum>
+                    </property>
+                </widget>
+            </hbox>
+        </widget>
+        <widget>
             <class>Line</class>
             <property stdset="1">
                 <name>name</name>
                 <cstring>Line3</cstring>
             </property>
             <property stdset="1">
                 <name>orientation</name>
                 <enum>Horizontal</enum>
             </property>
         </widget>
-        <widget row="9"  column="0" >
+        <widget>
+            <class>QLayoutWidget</class>
+            <property stdset="1">
+                <name>name</name>
+                <cstring>Layout27</cstring>
+            </property>
+            <hbox>
+                <property stdset="1">
+                    <name>margin</name>
+                    <number>0</number>
+                </property>
+                <property stdset="1">
+                    <name>spacing</name>
+                    <number>6</number>
+                </property>
+                <widget>
             <class>QLabel</class>
             <property stdset="1">
                 <name>name</name>
-                <cstring>passLabel</cstring>
+                        <cstring>prefixLabel</cstring>
             </property>
             <property stdset="1">
                 <name>text</name>
-                <string>Password</string>
+                        <string>Prefix</string>
             </property>
         </widget>
-        <widget row="6"  column="0"  rowspan="1"  colspan="2" >
+                <widget>
             <class>QLineEdit</class>
             <property stdset="1">
                 <name>name</name>
-                <cstring>CommandEdit</cstring>
+                        <cstring>prefixLine</cstring>
+                    </property>
+                </widget>
+            </hbox>
+        </widget>
+        <widget>
+            <class>QLayoutWidget</class>
+            <property stdset="1">
+                <name>name</name>
+                <cstring>Layout11</cstring>
+            </property>
+            <hbox>
+                <property stdset="1">
+                    <name>margin</name>
+                    <number>0</number>
+                </property>
+                <property stdset="1">
+                    <name>spacing</name>
+                    <number>6</number>
+                </property>
+                <widget>
+                    <class>QLabel</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>TextLabel1_2</cstring>
             </property>
             <property stdset="1">
                 <name>text</name>
-                <string>ssh $SERVER exec</string>
+                        <string>Local storage folder:</string>
             </property>
         </widget>
-        <widget row="5"  column="0"  rowspan="1"  colspan="2" >
-            <class>QComboBox</class>
+                <widget>
+                    <class>QLineEdit</class>
             <property stdset="1">
                 <name>name</name>
-                <cstring>ComboBox1</cstring>
+                        <cstring>localFolder</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>text</name>
+                        <string></string>
             </property>
         </widget>
-        <widget row="4"  column="0"  rowspan="1"  colspan="2" >
-            <class>QLabel</class>
+            </hbox>
+        </widget>
+        <widget>
+            <class>QLayoutWidget</class>
             <property stdset="1">
                 <name>name</name>
-                <cstring>TextLabel1</cstring>
+                <cstring>Layout12</cstring>
+            </property>
+            <hbox>
+                <property stdset="1">
+                    <name>margin</name>
+                    <number>0</number>
+                </property>
+                <property stdset="1">
+                    <name>spacing</name>
+                    <number>6</number>
+                </property>
+                <widget>
+                    <class>QCheckBox</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>CheckBoxDown</cstring>
             </property>
             <property stdset="1">
                 <name>text</name>
-                <string>Use secure sockets:</string>
+                        <string>Download only messages smaller</string>
+                    </property>
+                </widget>
+                <widget>
+                    <class>QSpinBox</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>SpinBoxDown</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>suffix</name>
+                        <string>kB</string>
+                    </property>
+                    <property stdset="1">
+                        <name>maxValue</name>
+                        <number>99999</number>
+                    </property>
+                    <property stdset="1">
+                        <name>minValue</name>
+                        <number>1</number>
+                    </property>
+                </widget>
+            </hbox>
+        </widget>
+        <widget>
+            <class>QCheckBox</class>
+            <property stdset="1">
+                <name>name</name>
+                <cstring>CheckBoxLeaveOn</cstring>
+            </property>
+            <property stdset="1">
+                <name>text</name>
+                <string>Leave Messages on Server</string>
             </property>
         </widget>
-    </grid>
+        <spacer>
+            <property>
+                <name>name</name>
+                <cstring>spacer</cstring>
+            </property>
+            <property stdset="1">
+                <name>orientation</name>
+                <enum>Vertical</enum>
+            </property>
+            <property stdset="1">
+                <name>sizeType</name>
+                <enum>Expanding</enum>
+            </property>
+            <property>
+                <name>sizeHint</name>
+                <size>
+                    <width>20</width>
+                    <height>20</height>
+                </size>
+            </property>
+        </spacer>
+    </vbox>
 </widget>
 <tabstops>
     <tabstop>accountLine</tabstop>
     <tabstop>serverLine</tabstop>
     <tabstop>portLine</tabstop>
     <tabstop>userLine</tabstop>
     <tabstop>passLine</tabstop>
 </tabstops>
 </UI>
diff --git a/kmicromail/libmailwrapper/settings.cpp b/kmicromail/libmailwrapper/settings.cpp
index 90e32fa..f996d9c 100644
--- a/kmicromail/libmailwrapper/settings.cpp
+++ b/kmicromail/libmailwrapper/settings.cpp
@@ -168,43 +168,55 @@ void IMAPaccount::read()
     if (server.isNull()) server="";
     port = conf->readEntry( "Port","" );
     if (port.isNull()) port="143";
     connectionType = conf->readNumEntry( "ConnectionType" );
     ssl = conf->readBoolEntry( "SSL",false );
     user = conf->readEntry( "User","" );
     if (user.isNull()) user = "";
     password = conf->readEntryCrypt( "Password","" );
     if (password.isNull()) password = "";
     prefix = conf->readEntry("MailPrefix","");
     if (prefix.isNull()) prefix = "";
     offline = conf->readBoolEntry("Offline",false);
+    localFolder = conf->readEntry( "LocalFolder" );
+    maxMailSize = conf->readNumEntry( "MaxSize",0 );
+    int lf = conf->readNumEntry( "LastFetch",0 );
+    QDateTime dt ( QDate ( 2004, 1, 1 ), QTime( 0,0,0) );
+    leaveOnServer = conf->readBoolEntry("LeaveOnServer",false);
+    lastFetch = dt.addSecs( lf );
     delete conf;
 }
 
 void IMAPaccount::save()
 {
     qDebug("saving %s ",getFileName().latin1() );
     Settings::checkDirectory();
 
     Config *conf = new Config( getFileName(), Config::File );
     conf->setGroup( "IMAP Account" );
     conf->writeEntry( "Account", accountName );
     conf->writeEntry( "Server", server );
     conf->writeEntry( "Port", port );
     conf->writeEntry( "SSL", ssl );
     conf->writeEntry( "ConnectionType", connectionType );
     conf->writeEntry( "User", user );
     conf->writeEntryCrypt( "Password", password );
     conf->writeEntry( "MailPrefix",prefix);
     conf->writeEntry( "Offline",offline);
+    conf->writeEntry( "LocalFolder", localFolder );
+    conf->writeEntry( "MaxSize", maxMailSize );
+    QDateTime dt ( QDate ( 2004, 1, 1 ), QTime( 0,0,0) );
+    int lf = dt.secsTo ( lastFetch );
+    conf->writeEntry( "LastFetch", lf );
+    conf->writeEntry( "LeaveOnServer", leaveOnServer);
     conf->write();
     delete conf;
 }
 
 
 QString IMAPaccount::getFileName()
 {
     return locateLocal("data", "kopiemail" ) +"/imap-" + file;
 }
 
 POP3account::POP3account()
     : Account()
@@ -250,47 +262,49 @@ void POP3account::read()
     accountName = conf->readEntry( "Account" );
     server = conf->readEntry( "Server" );
     port = conf->readEntry( "Port" );
     ssl = conf->readBoolEntry( "SSL" );
     connectionType = conf->readNumEntry( "ConnectionType" );
     user = conf->readEntry( "User" );
     password = conf->readEntryCrypt( "Password" );
     offline = conf->readBoolEntry("Offline",false);
     localFolder = conf->readEntry( "LocalFolder" );
     maxMailSize = conf->readNumEntry( "MaxSize",0 );
     int lf = conf->readNumEntry( "LastFetch",0 );
     QDateTime dt ( QDate ( 2004, 1, 1 ), QTime( 0,0,0) );
+    leaveOnServer = conf->readBoolEntry("LeaveOnServer",false);
     lastFetch = dt.addSecs( lf );
     delete conf;
 }
 
 void POP3account::save()
 {
     Settings::checkDirectory();
 
     Config *conf = new Config( getFileName(), Config::File );
     conf->setGroup( "POP3 Account" );
     conf->writeEntry( "Account", accountName );
     conf->writeEntry( "Server", server );
     conf->writeEntry( "Port", port );
     conf->writeEntry( "SSL", ssl );
     conf->writeEntry( "ConnectionType", connectionType );
     conf->writeEntry( "User", user );
     conf->writeEntryCrypt( "Password", password );
     conf->writeEntry( "Offline",offline);
     conf->writeEntry( "LocalFolder", localFolder );
     conf->writeEntry( "MaxSize", maxMailSize );
     QDateTime dt ( QDate ( 2004, 1, 1 ), QTime( 0,0,0) );
     int lf = dt.secsTo ( lastFetch );
     conf->writeEntry( "LastFetch", lf );
+    conf->writeEntry( "LeaveOnServer", leaveOnServer);
     conf->write();
     delete conf;
 }
 
 
 QString POP3account::getFileName()
 {
     return locateLocal("data", "kopiemail" ) +"/pop3-" + file;
 }
 
 SMTPaccount::SMTPaccount()
     : Account()
diff --git a/kmicromail/libmailwrapper/settings.h b/kmicromail/libmailwrapper/settings.h
index c33c403..85b817c 100644
--- a/kmicromail/libmailwrapper/settings.h
+++ b/kmicromail/libmailwrapper/settings.h
@@ -40,37 +40,41 @@ public:
     void setSSL( bool b ) { ssl = b; }
     bool getSSL() { return ssl; }
 
     void setConnectionType( int x ) { connectionType = x; }
     int ConnectionType() { return connectionType; }
 
     void setMaxMailSize( int x ) { maxMailSize = x; }
     int getMaxMailSize() { return maxMailSize; }
 
     void setOffline(bool b) {offline = b;}
     bool getOffline()const{return offline;}
 
+    bool getLeaveOnServer(){ return leaveOnServer;}
+    void setLeaveOnServer(bool b){ leaveOnServer = b;}
+
     virtual QString getFileName() { return accountName; }
     virtual void read() { ; }
     virtual void save() { ; }
 
 protected:
     QString accountName, server, port, user, password;
     bool ssl;
     int connectionType;
     bool offline;
     MAILLIB::ATYPE type;
     QString localFolder;
     int maxMailSize;
     QDateTime lastFetch;
+    bool leaveOnServer;
 };
 
 class IMAPaccount : public Account
 {
 
 public:
     IMAPaccount();
     IMAPaccount( QString filename );
 
     static QString getUniqueFileName();
 
     virtual void read();
diff --git a/kmicromail/pop3configui.ui b/kmicromail/pop3configui.ui
index a2d43bd..6acd394 100644
--- a/kmicromail/pop3configui.ui
+++ b/kmicromail/pop3configui.ui
@@ -2,46 +2,46 @@
 <class>POP3configUI</class>
 <widget>
     <class>QDialog</class>
     <property stdset="1">
         <name>name</name>
         <cstring>POP3configUI</cstring>
     </property>
     <property stdset="1">
         <name>geometry</name>
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>322</width>
-            <height>404</height>
+            <width>306</width>
+            <height>371</height>
         </rect>
     </property>
     <property stdset="1">
         <name>caption</name>
         <string>Configure POP3</string>
     </property>
     <property>
         <name>layoutMargin</name>
     </property>
     <property>
         <name>layoutSpacing</name>
     </property>
     <vbox>
         <property stdset="1">
             <name>margin</name>
-            <number>11</number>
+            <number>3</number>
         </property>
         <property stdset="1">
             <name>spacing</name>
-            <number>6</number>
+            <number>1</number>
         </property>
         <widget>
             <class>QLayoutWidget</class>
             <property stdset="1">
                 <name>name</name>
                 <cstring>Layout12</cstring>
             </property>
             <hbox>
                 <property stdset="1">
                     <name>margin</name>
                     <number>0</number>
                 </property>
@@ -396,24 +396,35 @@
                     </property>
                     <property stdset="1">
                         <name>maxValue</name>
                         <number>99999</number>
                     </property>
                     <property stdset="1">
                         <name>minValue</name>
                         <number>1</number>
                     </property>
                 </widget>
             </hbox>
         </widget>
+        <widget>
+            <class>QCheckBox</class>
+            <property stdset="1">
+                <name>name</name>
+                <cstring>CheckBoxLeaveOn</cstring>
+            </property>
+            <property stdset="1">
+                <name>text</name>
+                <string>Leave Messages on Server</string>
+            </property>
+        </widget>
         <spacer>
             <property>
                 <name>name</name>
                 <cstring>spacer</cstring>
             </property>
             <property stdset="1">
                 <name>orientation</name>
                 <enum>Vertical</enum>
             </property>
             <property stdset="1">
                 <name>sizeType</name>
                 <enum>Expanding</enum>