diff --git a/mail/inc/class.mail_bo.inc.php b/mail/inc/class.mail_bo.inc.php
index 3434d8a899..29cbd42967 100644
--- a/mail/inc/class.mail_bo.inc.php
+++ b/mail/inc/class.mail_bo.inc.php
@@ -1590,12 +1590,15 @@ class mail_bo
 				case 'FLAGGED':
 				case 'RECENT':
 				case 'SEEN':
+					$imapFilter->flag($criteria, $set=true);
+					$queryValid = true;
+					break;
 				case 'KEYWORD1':
 				case 'KEYWORD2':
 				case 'KEYWORD3':
 				case 'KEYWORD4':
 				case 'KEYWORD5':
-					$imapFilter->flag($criteria, $set=true);
+					$imapFilter->flag(str_ireplace('KEYWORD','$LABEL',$criteria), $set=true);
 					$queryValid = true;
 					break;
 				case 'NEW':