diff --git a/kmcommands.cpp b/kmcommands.cpp
index a14370506..88b9cb917 100644
--- a/kmcommands.cpp
+++ b/kmcommands.cpp
@@ -663,7 +663,8 @@ static KUrl subjectToUrl( const QString &subject )
   if ( !fileName.endsWith( ".mbox" ) )
     fileName += ".mbox";
 
-  return KFileDialog::getSaveUrl( KUrl::fromPath( fileName ), "*.mbox\n*.*" );
+  const QString filter = i18n( "*.mbox|email messages (*.mbox)\n*|all files (*)" );
+  return KFileDialog::getSaveUrl( KUrl::fromPath( fileName ), filter );
 }
 
 KMSaveMsgCommand::KMSaveMsgCommand( QWidget *parent, const Akonadi::Item& msg )
@@ -2264,6 +2265,11 @@ QString KMCommand::cleanFileName( const QString &name )
   fileName.replace( '/', '_' );
   fileName.replace( '\\', '_' );
 
+  // Avoid hidden files be replacing the first dot
+  if ( fileName.startsWith( "." ) ) {
+    fileName[0] = '_';
+  }
+
   return fileName;
 }