3 files changed, 6 insertions, 5 deletions

diff --git a/kmicromail/accountitem.cpp b/kmicromail/accountitem.cpp
index 59c8abb..12d047a 100644
--- a/kmicromail/accountitem.cpp
+++ b/kmicromail/accountitem.cpp
@@ -495,7 +495,7 @@ void IMAPviewItem::refreshFolders(bool force)
             titem = item;
             item = new IMAPfolderItem( (*it),pitem,pitem->firstChild(),this);
             /* setup the short name */
-            item->setText(0,(*it)->getDisplayName().right((*it)->getDisplayName().length()-pos-1));
+            item->setText(0,(*it)->getDisplayName().mid(pos+1));
             item = titem;
         }
         else
diff --git a/kmicromail/libmailwrapper/mailwrapper.cpp b/kmicromail/libmailwrapper/mailwrapper.cpp
index 9400649..2ee1ab3 100644
--- a/kmicromail/libmailwrapper/mailwrapper.cpp
+++ b/kmicromail/libmailwrapper/mailwrapper.cpp
@@ -46,11 +46,12 @@ const QString& Folder::Separator()const
     return separator;
 }
 
-IMAPFolder::IMAPFolder(const QString&name,const QString&sep, bool select,bool no_inf, const QString&aprefix )
-    : Folder( name,sep ),m_MaySelect(select),m_NoInferior(no_inf)
+IMAPFolder::IMAPFolder(const QString&t_name,const QString&sep, bool select,bool no_inf, const QString&aprefix )
+    : Folder( t_name,sep ),m_MaySelect(select),m_NoInferior(no_inf)
 {
   // Decode IMAP foldername
-  nameDisplay = IMAPFolder::decodeFolderName( name );
+  nameDisplay = IMAPFolder::decodeFolderName( t_name );
+  name = nameDisplay ;
   /*
   odebug << "folder " + name + " - displayed as " + nameDisplay << oendl; 
   */
diff --git a/kmicromail/libmailwrapper/mailwrapper.h b/kmicromail/libmailwrapper/mailwrapper.h
index cefe64e..2ba908b 100644
--- a/kmicromail/libmailwrapper/mailwrapper.h
+++ b/kmicromail/libmailwrapper/mailwrapper.h
@@ -120,8 +120,8 @@ class IMAPFolder : public Folder
         virtual ~IMAPFolder();
         virtual bool may_select()const{return m_MaySelect;}
         virtual bool no_inferior()const{return m_NoInferior;}
-    private:
         static QString decodeFolderName( const QString &name );
+    private:
         bool m_MaySelect,m_NoInferior;
 };