branches/KDE/4.3/kdepim/kmail (merge)

SVN commit 1005085 by tmcguire:

Backport r1004667 by tmcguire from trunk to the 4.3 branch:

SVN_MERGE
Merged revisions 1001019 via svnmerge from 
svn+ssh://tmcguire@xxxxxxxxxxx/home/kde/branches/kdepim/enterprise4/kdepim

................
  r1001019 | winterz | 2009-07-22 15:14:18 +0200 (Wed, 22 Jul 2009) | 12 lines
  
  Merged revisions 1000952 via svnmerge from 
  https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
  
  ........
    r1000952 | vkrause | 2009-07-22 07:33:21 -0400 (Wed, 22 Jul 2009) | 5 lines
    
    Also write Kolab properties of default groupware folders.
    
    Kolab issue 3734
    MERGE: e4, trunk, 4.3
  ........
................



 M  +1 -1      kmfolderdialog.cpp  


--- branches/KDE/4.3/kdepim/kmail/kmfolderdialog.cpp #1005084:1005085
@@ -747,7 +747,7 @@
   folder->setPutRepliesInSameFolder( 
mKeepRepliesInSameFolderCheckBox->isChecked() );
 
   QString fldName, oldFldName;
-  if ( !mIsLocalSystemFolder )
+  if ( !mIsLocalSystemFolder || mIsResourceFolder )
   {
     QString acctName;
     oldFldName = mDlg->folder()->name();