diff --git a/mail/inc/class.mail_ui.inc.php b/mail/inc/class.mail_ui.inc.php
index 221e196a88..1aa711550e 100644
--- a/mail/inc/class.mail_ui.inc.php
+++ b/mail/inc/class.mail_ui.inc.php
@@ -2196,6 +2196,7 @@ blockquote[type=cite] {
 				if (strtoupper($folderName)!= 'INBOX')
 				{
 					//error_log(__METHOD__.__LINE__."$folderName, $parentFolder, $_newName");
+					$oldFolderInfo = $this->mail_bo->getFolderStatus($folderName,false);
 					$this->mail_bo->reopen('INBOX');
 					if($newFolderName = $this->mail_bo->renameFolder($folderName, $parentFolder, $_newName)) {
 						$this->mail_bo->resetFolderObjectCache($profileID);
@@ -2207,6 +2208,7 @@ blockquote[type=cite] {
 					$fS = $this->mail_bo->getFolderStatus($newFolderName,false);
 					//error_log(__METHOD__.__LINE__.array2string($fS));
 					$oA[$_folderName]['id'] = $profileID.self::$delimiter.$newFolderName;
+					$oA[$_folderName]['olddesc'] = $oldFolderInfo['shortDisplayName'];
 					if ($fS['unseen'])
 					{
 						$oA[$_folderName]['desc'] = '<b>'.$fS['shortDisplayName'].' ('.$fS['unseen'].')</b>';
diff --git a/mail/js/app.js b/mail/js/app.js
index d831e4a7db..bd9f0a4a98 100644
--- a/mail/js/app.js
+++ b/mail/js/app.js
@@ -178,14 +178,25 @@ app.mail = AppJS.extend(
 	
 	/**
 	 * mail_setLeaf, function to set the id and description for the folder given by status key
+	 * @param array _status status array with the required data (new id, desc, old desc)
+	 *		key is the original id of the leaf to change
+	 *		multiple sets can be passed to mail_setLeaf
 	 */
 	mail_setLeaf: function(_status) {
 		//console.log('mail_setLeaf',_status);
 		var ftree = etemplate2.getByApplication('mail')[0].widgetContainer.getWidgetById('nm[foldertree]');
+		var selectedNode = ftree.getSelectedNode();
 		for (var i in _status)
 		{
+			app.mail.app_refresh(egw.lang("Renamed Folder %1 to %2",_status[i]['olddesc'],_status[i]['desc'], 'mail'));
 			ftree.renameItem(i,_status[i]['id'],_status[i]['desc']);
 			//alert(i +'->'+_status[i]['id']+'+'+_status[i]['desc']);
+			if (_status[i]['id']==selectedNode.id)
+			{
+				var nm = etemplate2.getByApplication('mail')[0].widgetContainer.getWidgetById('nm');
+				nm.activeFilters["selectedFolder"] = _status[i]['id'];
+				nm.applyFilters();
+			}
 		}
 	},
 
@@ -635,8 +646,9 @@ app.mail = AppJS.extend(
 		//alert(NewFolderName);
 		if (NewFolderName && NewFolderName.length>0)
 		{
+			app.mail.app_refresh(egw.lang("Renaming Folder %1 to %2",OldFolderName,NewFolderName, 'mail'));
 			var request = new egw_json_request('mail.mail_ui.ajax_renameFolder',[_senders[0].iface.id, NewFolderName]);
-			request.sendRequest(false);
+			request.sendRequest(true);
 		}
 	}
 });