SVN_MERGE:

Merged revisions 1076994 via svnmerge from 
https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim

........
  r1076994 | tmcguire | 2010-01-19 05:09:45 -0500 (Tue, 19 Jan 2010) | 5 lines
  
  It is apparently the expected behaviour of KShell::tildeExpand() to expand "~test" to the
  home dir, so work around that.
  
  Fixes kolab/issue3805
........

svn path=/trunk/KDE/kdepim/kmail/; revision=1080292

kmcommands.cpp

@@ -2266,6 +2266,10 @@ QString KMCommand::cleanFileName( const QString &name )
   // replace all '.' with '_', not just at the start of the filename
   fileName.replace( '.', '_' );
 
+  if ( fileName.startsWith( '~' ) ) {
+    fileName[0] = '_';
+  }
+
   return fileName;
 }