6 files changed, 32 insertions, 8 deletions

diff --git a/noncore/net/mail/imapwrapper.cpp b/noncore/net/mail/imapwrapper.cpp
index b253b49..0ce2c6c 100644
--- a/noncore/net/mail/imapwrapper.cpp
+++ b/noncore/net/mail/imapwrapper.cpp
@@ -201,9 +201,11 @@ QList<Folder>* IMAPwrapper::listFolders()
             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));
+            folders->append(new IMAPFolder(temp,selectable,account->getPrefix()));
         }
     } else {
diff --git a/noncore/net/mail/libmailwrapper/imapwrapper.cpp b/noncore/net/mail/libmailwrapper/imapwrapper.cpp
index b253b49..0ce2c6c 100644
--- a/noncore/net/mail/libmailwrapper/imapwrapper.cpp
+++ b/noncore/net/mail/libmailwrapper/imapwrapper.cpp
@@ -201,9 +201,11 @@ QList<Folder>* IMAPwrapper::listFolders()
             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));
+            folders->append(new IMAPFolder(temp,selectable,account->getPrefix()));
         }
     } else {
diff --git a/noncore/net/mail/libmailwrapper/mailwrapper.cpp b/noncore/net/mail/libmailwrapper/mailwrapper.cpp
index 3ffc274..96602c2 100644
--- a/noncore/net/mail/libmailwrapper/mailwrapper.cpp
+++ b/noncore/net/mail/libmailwrapper/mailwrapper.cpp
@@ -35,8 +35,18 @@ Folder::Folder(const QString&tmp_name )
         }
     }
-
     qDebug( "folder " + name + " - displayed as " + nameDisplay );
 }
 
+
+IMAPFolder::IMAPFolder(const QString&name,bool select,const QString&prefix )
+    : Folder( name ),m_MaySelect(select)
+{
+    if (prefix.length()>0) {
+        if (nameDisplay.startsWith(prefix) && nameDisplay.length()>prefix.length()) {
+            nameDisplay=nameDisplay.right(nameDisplay.length()-prefix.length());
+        }
+    }
+}
+
 MailWrapper::MailWrapper( Settings *s )
     : QObject()
diff --git a/noncore/net/mail/libmailwrapper/mailwrapper.h b/noncore/net/mail/libmailwrapper/mailwrapper.h
index 34fd5c5..6994dd8 100644
--- a/noncore/net/mail/libmailwrapper/mailwrapper.h
+++ b/noncore/net/mail/libmailwrapper/mailwrapper.h
@@ -77,5 +77,5 @@ public:
     virtual bool may_select()const{return true;};    
 
-private:
+protected:
     QString nameDisplay, name;
     
@@ -85,5 +85,5 @@ class IMAPFolder : public Folder
 {
     public:
-        IMAPFolder( QString name,bool select=true ) : Folder( name ),m_MaySelect(select) {}
+        IMAPFolder(const QString&name,bool select=true,const QString&prefix="" );
         virtual bool may_select()const{return m_MaySelect;}
     private:
diff --git a/noncore/net/mail/mailwrapper.cpp b/noncore/net/mail/mailwrapper.cpp
index 3ffc274..96602c2 100644
--- a/noncore/net/mail/mailwrapper.cpp
+++ b/noncore/net/mail/mailwrapper.cpp
@@ -35,8 +35,18 @@ Folder::Folder(const QString&tmp_name )
         }
     }
-
     qDebug( "folder " + name + " - displayed as " + nameDisplay );
 }
 
+
+IMAPFolder::IMAPFolder(const QString&name,bool select,const QString&prefix )
+    : Folder( name ),m_MaySelect(select)
+{
+    if (prefix.length()>0) {
+        if (nameDisplay.startsWith(prefix) && nameDisplay.length()>prefix.length()) {
+            nameDisplay=nameDisplay.right(nameDisplay.length()-prefix.length());
+        }
+    }
+}
+
 MailWrapper::MailWrapper( Settings *s )
     : QObject()
diff --git a/noncore/net/mail/mailwrapper.h b/noncore/net/mail/mailwrapper.h
index 34fd5c5..6994dd8 100644
--- a/noncore/net/mail/mailwrapper.h
+++ b/noncore/net/mail/mailwrapper.h
@@ -77,5 +77,5 @@ public:
     virtual bool may_select()const{return true;};    
 
-private:
+protected:
     QString nameDisplay, name;
     
@@ -85,5 +85,5 @@ class IMAPFolder : public Folder
 {
     public:
-        IMAPFolder( QString name,bool select=true ) : Folder( name ),m_MaySelect(select) {}
+        IMAPFolder(const QString&name,bool select=true,const QString&prefix="" );
         virtual bool may_select()const{return m_MaySelect;}
     private: