diff --git a/mail/inc/class.mail_ui.inc.php b/mail/inc/class.mail_ui.inc.php
index ebb8921bf5..f02a4c0b0c 100644
--- a/mail/inc/class.mail_ui.inc.php
+++ b/mail/inc/class.mail_ui.inc.php
@@ -4375,7 +4375,7 @@ $filter['before']= date("d-M-Y", $cutoffdate2);
 			Api\Translation::add_app('mail');
 
 			$refreshData = array(
-				$icServerID => $mail_ui->mail_tree->getTree(null,$icServerID,1,false,!$mail_ui->mail_bo->mailPreferences['showAllFoldersInFolderPane'],!$mail_ui->mail_bo->mailPreferences['showAllFoldersInFolderPane'])
+				$icServerID => $mail_ui->mail_tree->getTree($icServerID,$icServerID,1,false,!$mail_ui->mail_bo->mailPreferences['showAllFoldersInFolderPane'],!$mail_ui->mail_bo->mailPreferences['showAllFoldersInFolderPane'])
 			);
 			$response->call('app.mail.mail_reloadNode',$refreshData);
 		}
diff --git a/mail/js/app.js b/mail/js/app.js
index b4c34d08c4..f29d96ae9f 100644
--- a/mail/js/app.js
+++ b/mail/js/app.js
@@ -1668,12 +1668,9 @@ app.classes.mail = AppJS.extend(
 			// if olddesc is undefined or #skip# then skip the message, as we process subfolders
 			if (typeof _status[i] !== 'undefined' && _status[i] !== '#skip-user-interaction-message#')
 			{
-				if (typeof _status[i].parent !== 'undefined')
-				{
-					this.egw.message(this.egw.lang("Reloaded Folder %1",typeof _status[i] == "string" ? _status[i].replace(this._unseen_regexp, '') : _status[i].text.replace(this._unseen_regexp, '')));
-				} else {
-					this.egw.message(this.egw.lang("Reloaded Account %1",typeof _status[i] == "string" ? _status[i].replace(this._unseen_regexp, '') : _status[i].text.replace(this._unseen_regexp, '')));
-				}
+					this.egw.message(this.egw.lang((typeof _status[i].parent !== 'undefined'? "Reloaded Folder %1" : "Reloaded Account %1") ,
+					(typeof _status[i] == "string" ? _status[i].replace(this._unseen_regexp, '') :
+							(_status[i].text ? _status[i].text.replace(this._unseen_regexp, '') : _status[i].id))));
 			}
 			ftree.refreshItem(i,typeof _status[i] == "object" ? _status[i] : null);
 			if (typeof _status[i] == "string") ftree.setStyle(i, 'font-weight: '+(_status[i].match(this._unseen_regexp) ? 'bold' : 'normal'));