diff --git a/NEWS b/NEWS
index 4a3a731b5..4dcb8d11e 100644
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,7 @@
 
 Enhancements
  - updated Czech, Finnish, and Hungarian translations
+ - show current folder name in prompt dialog when renaming a mail folder
 
 Bug fixes
  - fixed an issue with ActiveSync when the number of messages in the mailbox was greater than the window-size specified by the client
diff --git a/UI/WebServerResources/MailerUI.js b/UI/WebServerResources/MailerUI.js
index 9b98b8d14..3102d23d4 100644
--- a/UI/WebServerResources/MailerUI.js
+++ b/UI/WebServerResources/MailerUI.js
@@ -2309,7 +2309,8 @@ function onMenuCreateFolderConfirm(event) {
 }
 
 function onMenuRenameFolder(event) {
-    showPromptDialog(_("Rename Folder..."), _("Enter the new name of your folder :"), onMenuRenameFolderConfirm);
+    var folderName = document.menuTarget.down('.nodeName').childNodes[0].nodeValue;
+    showPromptDialog(_("Rename Folder..."), _("Enter the new name of your folder :"), onMenuRenameFolderConfirm, folderName);
 }
 
 function onMenuRenameFolderConfirm() {
diff --git a/UI/WebServerResources/generic.js b/UI/WebServerResources/generic.js
index 89149d9a0..f6a9e4888 100644
--- a/UI/WebServerResources/generic.js
+++ b/UI/WebServerResources/generic.js
@@ -2157,7 +2157,10 @@ function _showPromptDialog(title, label, callback, defaultValue) {
     }
     if (Prototype.Browser.IE)
         jQuery('#bgDialogDiv').css('opacity', 0.4);
-    jQuery(dialog).fadeIn('fast', function () { dialog.down("input").focus(); });
+    jQuery(dialog).fadeIn('fast', function () {
+        var input = dialog.down("input");
+        input.selectText(0, input.value.length);
+    });
 }
 
 function showSelectDialog(title, label, options, button, callbackFcn, callbackArg, defaultValue) {