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
@@ -482,33 +482,33 @@ void IMAPviewItem::refreshFolders(bool force)
     }
     for ( it = folders->begin(); it!=folders->end(); ++it)
     {
         fname = (*it)->getDisplayName();
         currentFolders.append((*it)->getName());
         pos = fname.findRev((*it)->Separator());
         if (pos != -1)
         {
             fname = fname.left(pos);
         }
         IMAPfolderItem*pitem = (IMAPfolderItem*)findSubItem(fname);
         if (pitem)
         {
             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
         {
             item = new IMAPfolderItem( (*it), this , item );
         }
     }
     delete folders;
 }
 
 QPopupMenu * IMAPviewItem::getContextMenu()
 {
     QPopupMenu *m = new QPopupMenu(0);
     if (m)
     {
         if (!account->getOffline())
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
@@ -33,37 +33,38 @@ Folder::Folder(const QString&tmp_name, const QString&sep  )
 {
     name = tmp_name;
     nameDisplay = name;
     separator = sep;
     prefix = "";
 }
 
 Folder::~Folder()
 {
 }
 
 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; 
   */
     prefix = aprefix;
 
     if (prefix.length()>0) {
         if (nameDisplay.startsWith(prefix) && nameDisplay.length()>prefix.length()) {
             nameDisplay=nameDisplay.right(nameDisplay.length()-prefix.length());
         }
     }
 }
 
 IMAPFolder::~IMAPFolder()
 {
 }
 
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
@@ -107,22 +107,22 @@ protected:
 typedef Opie::Core::OSmartPointer<Folder> FolderP;
 
 class MHFolder : public Folder
 {
 public:
     MHFolder(const QString&disp_name,const QString&mbox);
     virtual ~MHFolder();
 };
 
 class IMAPFolder : public Folder
 {
     public:
         IMAPFolder(const QString&name, const QString&sep, bool select=true,bool noinf=false,const QString&prefix="" );
         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;
 };
 
 #endif