diff --git a/mail/inc/class.mail_ui.inc.php b/mail/inc/class.mail_ui.inc.php
index 6c58b72b6c..69f13fbea9 100644
--- a/mail/inc/class.mail_ui.inc.php
+++ b/mail/inc/class.mail_ui.inc.php
@@ -630,7 +630,7 @@ class mail_ui
 				if ($junkFolder && !empty($junkFolder))
 				{
 					$tree_actions['empty_spam'] = array(
-						'caption' => 'empty spam',
+						'caption' => 'empty junk',
 						'icon' => 'dhtmlxtree/MailFolderJunk',
 						'enabled'	=> 'javaScript:app.mail.spamfolder_enabled',
 						'onExecute' => 'javaScript:app.mail.mail_emptySpam',
@@ -4248,7 +4248,7 @@ class mail_ui
 		if(!empty($junkFolder)) {
 			if ($selectedFolder == $icServerID.self::$delimiter.$junkFolder)
 			{
-				// Lock the tree if the active folder is Trash folder
+				// Lock the tree if the active folder is junk folder
 				$response->call('app.mail.lock_tree');
 			}
 			$this->mail_bo->deleteMessages('all',$junkFolder,'remove_immediately');
@@ -4256,10 +4256,10 @@ class mail_ui
 			$heirarchyDelimeter = $this->mail_bo->getHierarchyDelimiter(true);
 			$fShortName =  array_pop(explode($heirarchyDelimeter, $junkFolder));
 			$fStatus = array(
-				$icServerID.self::$delimiter.$trashFolder => lang($fShortName)
+				$icServerID.self::$delimiter.$junkFolder => lang($fShortName)
 			);
 			//Call to reset folder status counter, after junkFolder triggered not from Junk folder
-			//-as we don't have trash folder specific information available on client-side we need to deal with it on server
+			//-as we don't have junk folder specific information available on client-side we need to deal with it on server
 			$response->call('app.mail.mail_setFolderStatus',$fStatus);
 		}
 		if ($rememberServerID != $this->mail_bo->profileID)
diff --git a/mail/js/app.js b/mail/js/app.js
index 399424375f..0cb8550669 100644
--- a/mail/js/app.js
+++ b/mail/js/app.js
@@ -1604,7 +1604,7 @@ app.classes.mail = AppJS.extend(
 		var activeFilters = this.mail_getActiveFilters();
 		var self = this;
 
-		this.egw.message(this.egw.lang('empty spam'));
+		this.egw.message(this.egw.lang('empty junk'));
 		egw.json('mail.mail_ui.ajax_emptySpam',[server[0], activeFilters['selectedFolder']? activeFilters['selectedFolder']:null],function(){self.unlock_tree();})
 			.sendRequest(true);
 
diff --git a/mail/lang/egw_de.lang b/mail/lang/egw_de.lang
index 59874e27e5..3750e9f9f5 100644
--- a/mail/lang/egw_de.lang
+++ b/mail/lang/egw_de.lang
@@ -135,6 +135,7 @@ email notification update failed	mail	de	Die Benachrichtigung über den Gelesen-
 email notification update failed! you need to set an email address!	mail	de	Aktualisierung der E-Mail Benachrichtigungen fehlgeschlagen! Es muss eine E-Mail-Adresse ausgewählt sein!
 emailaddress	admin	de	E-Mail
 emailadmin: profilemanagement	mail	de	E-Mail-Admin: Profilmanagement
+empty junk	mail	de	Junk-/Spam- Ordner leeren
 empty trash	mail	de	Papierkorb leeren
 enable	mail	de	Aktivieren
 enabled!	mail	de	aktiviert!
diff --git a/mail/lang/egw_en.lang b/mail/lang/egw_en.lang
index 3a3c1be5bc..af4bdb06cb 100644
--- a/mail/lang/egw_en.lang
+++ b/mail/lang/egw_en.lang
@@ -135,6 +135,7 @@ email notification update failed	mail	en	email notification update failed
 email notification update failed! you need to set an email address!	mail	en	email notification update failed! You need to set an email address!
 emailaddress	admin	en	emailaddress
 emailadmin: profilemanagement	mail	en	eMailAdmin: Profilemanagement
+empty junk	mail	en	empty junk/spam folder
 empty trash	mail	en	empty trash
 enable	mail	en	Enable
 enabled!	mail	en	enabled!