diff --git a/emailadmin/inc/class.emailadmin_imapbase.inc.php b/emailadmin/inc/class.emailadmin_imapbase.inc.php
index 82aa87259b..745fad946d 100644
--- a/emailadmin/inc/class.emailadmin_imapbase.inc.php
+++ b/emailadmin/inc/class.emailadmin_imapbase.inc.php
@@ -3366,100 +3366,122 @@ class emailadmin_imapbase
 			if (self::$debug) error_log(__METHOD__." no messages Message(s): ".implode(',',$_messageUID));
 			return false;
 		}
-		elseif ($_messageUID==='all')
+		$this->icServer->openMailbox(($_folder?$_folder:$this->sessionData['mailbox']));
+		$folder = $this->icServer->getCurrentMailbox();
+		if (is_array($_messageUID)&& count($_messageUID)>50)
 		{
-			$uidsToModify= null;
+			$count = $this->getMailBoxCounters($folder,true);
+			if ($count->messages == count($_messageUID)) $_messageUID='all';
+		}
+
+		if ($_messageUID==='all')
+		{
+			$messageUIDs = array('all');
 		}
 		else
 		{
-			$uidsToModify = new Horde_Imap_Client_Ids();
 			if (!(is_object($_messageUID) || is_array($_messageUID))) $_messageUID = (array)$_messageUID;
-			$uidsToModify->add($_messageUID);
+			$messageUIDs = array_chunk($_messageUID,50,true);
 		}
-
-		$this->icServer->openMailbox(($_folder?$_folder:$this->sessionData['mailbox']));
-		$folder = $this->icServer->getCurrentMailbox();;
-		switch($_flag) {
-			case "delete":
-				$ret = $this->icServer->store($folder, array('add'=>array('\\Deleted'), 'ids'=> $uidsToModify));
-				break;
-			case "undelete":
-				$ret = $this->icServer->store($folder, array('remove'=>array('\\Deleted'), 'ids'=> $uidsToModify));
-				break;
-			case "flagged":
-				$ret = $this->icServer->store($folder, array('add'=>array('\\Flagged'), 'ids'=> $uidsToModify));
-				break;
-			case "read":
-			case "seen":
-				$ret = $this->icServer->store($folder, array('add'=>array('\\Seen'), 'ids'=> $uidsToModify));
-				break;
-			case "forwarded":
-				$ret = $this->icServer->store($folder, array('add'=>array('$Forwarded'), 'ids'=> $uidsToModify));
-			case "answered":
-				$ret = $this->icServer->store($folder, array('add'=>array('\\Answered'), 'ids'=> $uidsToModify));
-				break;
-			case "unflagged":
-				$ret = $this->icServer->store($folder, array('remove'=>array('\\Flagged'), 'ids'=> $uidsToModify));
-				break;
-			case "unread":
-			case "unseen":
-				$ret = $this->icServer->store($folder, array('remove'=>array('\\Seen','\\Answered','$Forwarded'), 'ids'=> $uidsToModify));
-				break;
-			case "mdnsent":
-				$ret = $this->icServer->store($folder, array('add'=>array('MDNSent'), 'ids'=> $uidsToModify));
-				break;
-			case "mdnnotsent":
-				$ret = $this->icServer->store($folder, array('add'=>array('MDNnotSent'), 'ids'=> $uidsToModify));
-				break;
-			case "label1":
-			case "labelone":
-				$ret = $this->icServer->store($folder, array('add'=>array('$label1'), 'ids'=> $uidsToModify));
-				break;
-			case "unlabel1":
-			case "unlabelone":
-				$ret = $this->icServer->store($folder, array('remove'=>array('$label1'), 'ids'=> $uidsToModify));
-				break;
-			case "label2":
-			case "labeltwo":
-				$ret = $this->icServer->store($folder, array('add'=>array('$label2'), 'ids'=> $uidsToModify));
-				break;
-			case "unlabel2":
-			case "unlabeltwo":
-				$ret = $this->icServer->store($folder, array('remove'=>array('$label2'), 'ids'=> $uidsToModify));
-				break;
-			case "label3":
-			case "labelthree":
-				$ret = $this->icServer->store($folder, array('add'=>array('$label3'), 'ids'=> $uidsToModify));
-				break;
-			case "unlabel3":
-			case "unlabelthree":
-				$ret = $this->icServer->store($folder, array('remove'=>array('$label3'), 'ids'=> $uidsToModify));
-				break;
-			case "label4":
-			case "labelfour":
-				$ret = $this->icServer->store($folder, array('add'=>array('$label4'), 'ids'=> $uidsToModify));
-				break;
-			case "unlabel4":
-			case "unlabelfour":
-				$ret = $this->icServer->store($folder, array('remove'=>array('$label4'), 'ids'=> $uidsToModify));
-				break;
-			case "label5":
-			case "labelfive":
-				$ret = $this->icServer->store($folder, array('add'=>array('$label5'), 'ids'=> $uidsToModify));
-				break;
-			case "unlabel5":
-			case "unlabelfive":
-				$ret = $this->icServer->store($folder, array('remove'=>array('$label5'), 'ids'=> $uidsToModify));
-				break;
-			case "unlabel":
-				$ret = $this->icServer->store($folder, array('remove'=>array('$label1'), 'ids'=> $uidsToModify));
-				$ret = $this->icServer->store($folder, array('remove'=>array('$label2'), 'ids'=> $uidsToModify));
-				$ret = $this->icServer->store($folder, array('remove'=>array('$label3'), 'ids'=> $uidsToModify));
-				$ret = $this->icServer->store($folder, array('remove'=>array('$label4'), 'ids'=> $uidsToModify));
-				$ret = $this->icServer->store($folder, array('remove'=>array('$label5'), 'ids'=> $uidsToModify));
-				break;
+		try
+		{
+			foreach($messageUIDs as $k => $uids)
+			{
+				if ($uids==='all')
+				{
+					$uidsToModify=null;
+				}
+				else
+				{
+					$uidsToModify = new Horde_Imap_Client_Ids();
+					$uidsToModify->add($uids);
+				}
+				switch($_flag) {
+					case "delete":
+						$ret = $this->icServer->store($folder, array('add'=>array('\\Deleted'), 'ids'=> $uidsToModify));
+						break;
+					case "undelete":
+						$ret = $this->icServer->store($folder, array('remove'=>array('\\Deleted'), 'ids'=> $uidsToModify));
+						break;
+					case "flagged":
+						$ret = $this->icServer->store($folder, array('add'=>array('\\Flagged'), 'ids'=> $uidsToModify));
+						break;
+					case "read":
+					case "seen":
+						$ret = $this->icServer->store($folder, array('add'=>array('\\Seen'), 'ids'=> $uidsToModify));
+						break;
+					case "forwarded":
+						$ret = $this->icServer->store($folder, array('add'=>array('$Forwarded'), 'ids'=> $uidsToModify));
+					case "answered":
+						$ret = $this->icServer->store($folder, array('add'=>array('\\Answered'), 'ids'=> $uidsToModify));
+						break;
+					case "unflagged":
+						$ret = $this->icServer->store($folder, array('remove'=>array('\\Flagged'), 'ids'=> $uidsToModify));
+						break;
+					case "unread":
+					case "unseen":
+						$ret = $this->icServer->store($folder, array('remove'=>array('\\Seen','\\Answered','$Forwarded'), 'ids'=> $uidsToModify));
+						break;
+					case "mdnsent":
+						$ret = $this->icServer->store($folder, array('add'=>array('MDNSent'), 'ids'=> $uidsToModify));
+						break;
+					case "mdnnotsent":
+						$ret = $this->icServer->store($folder, array('add'=>array('MDNnotSent'), 'ids'=> $uidsToModify));
+						break;
+					case "label1":
+					case "labelone":
+						$ret = $this->icServer->store($folder, array('add'=>array('$label1'), 'ids'=> $uidsToModify));
+						break;
+					case "unlabel1":
+					case "unlabelone":
+						$ret = $this->icServer->store($folder, array('remove'=>array('$label1'), 'ids'=> $uidsToModify));
+						break;
+					case "label2":
+					case "labeltwo":
+						$ret = $this->icServer->store($folder, array('add'=>array('$label2'), 'ids'=> $uidsToModify));
+						break;
+					case "unlabel2":
+					case "unlabeltwo":
+						$ret = $this->icServer->store($folder, array('remove'=>array('$label2'), 'ids'=> $uidsToModify));
+						break;
+					case "label3":
+					case "labelthree":
+						$ret = $this->icServer->store($folder, array('add'=>array('$label3'), 'ids'=> $uidsToModify));
+						break;
+					case "unlabel3":
+					case "unlabelthree":
+						$ret = $this->icServer->store($folder, array('remove'=>array('$label3'), 'ids'=> $uidsToModify));
+						break;
+					case "label4":
+					case "labelfour":
+						$ret = $this->icServer->store($folder, array('add'=>array('$label4'), 'ids'=> $uidsToModify));
+						break;
+					case "unlabel4":
+					case "unlabelfour":
+						$ret = $this->icServer->store($folder, array('remove'=>array('$label4'), 'ids'=> $uidsToModify));
+						break;
+					case "label5":
+					case "labelfive":
+						$ret = $this->icServer->store($folder, array('add'=>array('$label5'), 'ids'=> $uidsToModify));
+						break;
+					case "unlabel5":
+					case "unlabelfive":
+						$ret = $this->icServer->store($folder, array('remove'=>array('$label5'), 'ids'=> $uidsToModify));
+						break;
+					case "unlabel":
+						$ret = $this->icServer->store($folder, array('remove'=>array('$label1'), 'ids'=> $uidsToModify));
+						$ret = $this->icServer->store($folder, array('remove'=>array('$label2'), 'ids'=> $uidsToModify));
+						$ret = $this->icServer->store($folder, array('remove'=>array('$label3'), 'ids'=> $uidsToModify));
+						$ret = $this->icServer->store($folder, array('remove'=>array('$label4'), 'ids'=> $uidsToModify));
+						$ret = $this->icServer->store($folder, array('remove'=>array('$label5'), 'ids'=> $uidsToModify));
+						break;
+				}
+			}
+		}
+		catch(Exception $e)
+		{
+			error_log(__METHOD__.__LINE__.' Error, could not flag messages in folder '.$folder.' Reason:'.$e->getMessage());
 		}
-
 		self::$folderStatusCache[$this->profileID][(!empty($_folder)?$_folder: $this->sessionData['mailbox'])]['uidValidity'] = 0;
 
 		//error_log(__METHOD__.' ('.__LINE__.') '.'->' .$_flag." ".array2string($_messageUID).",".($_folder?$_folder:$this->sessionData['mailbox']));
diff --git a/mail/inc/class.mail_ui.inc.php b/mail/inc/class.mail_ui.inc.php
index 9ed4e3118a..5662aa637a 100644
--- a/mail/inc/class.mail_ui.inc.php
+++ b/mail/inc/class.mail_ui.inc.php
@@ -4203,13 +4203,13 @@ class mail_ui
 						if (count($messageListForToggle)>0)
 						{
 							$flag2set = (strtolower($_flag));
-							//error_log(__METHOD__.__LINE__." toggle un$_flag -> $flag2set ".array2string($filter2toggle).array2string($messageListForToggle));
+							if(mail_bo::$debug) error_log(__METHOD__.__LINE__." toggle un$_flag -> $flag2set ".array2string($filter2toggle).array2string($messageListForToggle));
 							$this->mail_bo->flagMessages($flag2set, $messageListForToggle,$folder);
 						}
 						if (count($messageList)>0)
 						{
 							$flag2set = 'un'.$_flag;
-							//error_log(__METHOD__.__LINE__." $_flag -> $flag2set ".array2string($filter).array2string($messageList));
+							if(mail_bo::$debug) error_log(__METHOD__.__LINE__." $_flag -> $flag2set ".array2string($filter).array2string($messageList));
 							$this->mail_bo->flagMessages($flag2set, $messageList,$folder);
 						}
 						$alreadyFlagged=true;
@@ -4219,6 +4219,13 @@ class mail_ui
 						(in_array($_flag,array('read','flagged','label1','label2','label3','label4','label5')) &&
 						($flag2check==$query['filter'] || stripos($query['filter'],$flag2check)!==false))))
 					{
+						if ($query['filter'] && $query['filter'] !='any')
+						{
+							$filter['status'] = $query['filter'];
+							// since we toggle and we toggle by the filtered flag we must must change _flag
+							$_flag = ($query['filter']=='unseen' && $_flag=='read' ? 'read' : ($query['filter']=='seen'&& $_flag=='read'?'unread':($_flag==$query['filter']?'un'.$_flag:$_flag)));
+						}
+						if(mail_bo::$debug) error_log(__METHOD__.__LINE__." flag all with $_flag on filter used:".array2string($filter));
 						$_sR = $this->mail_bo->getSortedList(
 							$folder,
 							$sort=0,
@@ -4233,7 +4240,7 @@ class mail_ui
 					}
 					else
 					{
-						//error_log(__METHOD__.__LINE__." $_flag all ".array2string($filter));
+						if(mail_bo::$debug) error_log(__METHOD__.__LINE__." $_flag all ".array2string($filter));
 						$alreadyFlagged=true;
 						$uidA = self::splitRowID($_messageList['msg'][0]);
 						$folder = $uidA['folder']; // all messages in one set are supposed to be within the same folder
@@ -4253,7 +4260,7 @@ class mail_ui
 					$hA = self::splitRowID($rowID);
 					$messageList[] = $hA['msgUID'];
 				}
-				//error_log(__METHOD__.__LINE__." $_flag in $folder:".array2string(((isset($_messageList['all']) && $_messageList['all']) ? 'all':$messageList)));
+				if(mail_bo::$debug) error_log(__METHOD__.__LINE__." $_flag in $folder:".array2string(((isset($_messageList['all']) && $_messageList['all']) ? 'all':$messageList)));
 				$this->mail_bo->flagMessages($_flag, ((isset($_messageList['all']) && $_messageList['all']) ? 'all':$messageList),$folder);
 			}
 		}