4 files changed, 18 insertions, 9 deletions
diff --git a/noncore/net/mail/libmailwrapper/imapwrapper.cpp b/noncore/net/mail/libmailwrapper/imapwrapper.cpp
index d56d7f9..8a86c95 100644
--- a/noncore/net/mail/libmailwrapper/imapwrapper.cpp
+++ b/noncore/net/mail/libmailwrapper/imapwrapper.cpp
@@ -167,2 +167,3 @@ QList<Folder>* IMAPwrapper::listFolders()
     err = mailimap_list( m_imap, (char*)"", (char*)mask, &result );
+    QString del;
     if ( err == MAILIMAP_NO_ERROR ) {
@@ -174,3 +175,4 @@ QList<Folder>* IMAPwrapper::listFolders()
             temp = list->mb_name;
-            folders->append( new IMAPFolder(temp));
+            del = list->mb_delimiter;
+            folders->append( new IMAPFolder(temp,del,true,account->getPrefix()));
             current = current->next;
@@ -208,3 +210,4 @@ QList<Folder>* IMAPwrapper::listFolders()
             }
-            folders->append(new IMAPFolder(temp,selectable,account->getPrefix()));
+            del = list->mb_delimiter;
+            folders->append(new IMAPFolder(temp,del,selectable,account->getPrefix()));
         }
diff --git a/noncore/net/mail/libmailwrapper/mailwrapper.cpp b/noncore/net/mail/libmailwrapper/mailwrapper.cpp
index 96602c2..858283f 100644
--- a/noncore/net/mail/libmailwrapper/mailwrapper.cpp
+++ b/noncore/net/mail/libmailwrapper/mailwrapper.cpp
@@ -19,3 +19,3 @@ Attachment::Attachment( DocLnk lnk )
 
-Folder::Folder(const QString&tmp_name )
+Folder::Folder(const QString&tmp_name, const QString&sep  )
 {
@@ -37,7 +37,12 @@ Folder::Folder(const QString&tmp_name )
     qDebug( "folder " + name + " - displayed as " + nameDisplay );
+    separator = sep;
 }
 
+const QString& Folder::Separator()const
+{
+    return separator;
+}
 
-IMAPFolder::IMAPFolder(const QString&name,bool select,const QString&prefix )
-    : Folder( name ),m_MaySelect(select)
+IMAPFolder::IMAPFolder(const QString&name,const QString&sep, bool select,const QString&prefix )
+    : Folder( name,sep ),m_MaySelect(select)
 {
diff --git a/noncore/net/mail/libmailwrapper/mailwrapper.h b/noncore/net/mail/libmailwrapper/mailwrapper.h
index 6994dd8..d78f8e9 100644
--- a/noncore/net/mail/libmailwrapper/mailwrapper.h
+++ b/noncore/net/mail/libmailwrapper/mailwrapper.h
@@ -73,3 +73,3 @@ class Folder : public QObject
 public:
-    Folder( const QString&init_name );
+    Folder( const QString&init_name,const QString&sep );
     const QString&getDisplayName()const { return nameDisplay; }
@@ -77,5 +77,6 @@ public:
     virtual bool may_select()const{return true;};    
+    const QString&Separator()const;
 
 protected:
-    QString nameDisplay, name;
+    QString nameDisplay, name, separator;
     
@@ -86,3 +87,3 @@ class IMAPFolder : public Folder
     public:
-        IMAPFolder(const QString&name,bool select=true,const QString&prefix="" );
+        IMAPFolder(const QString&name, const QString&sep, bool select=true,const QString&prefix="" );
         virtual bool may_select()const{return m_MaySelect;}
diff --git a/noncore/net/mail/libmailwrapper/pop3wrapper.cpp b/noncore/net/mail/libmailwrapper/pop3wrapper.cpp
index 075d8c7..4508a95 100644
--- a/noncore/net/mail/libmailwrapper/pop3wrapper.cpp
+++ b/noncore/net/mail/libmailwrapper/pop3wrapper.cpp
@@ -325,3 +325,3 @@ QList<Folder>* POP3wrapper::listFolders()
     folders->setAutoDelete( false );
-    Folder*inb=new Folder("INBOX");
+    Folder*inb=new Folder("INBOX","/");
     folders->append(inb);