Merge pull request #1361 from Oldiesmann/release-2.1

! More logic issues...

Sources/PersonalMessage.php

@@ -2733,8 +2733,10 @@ function MessageActionsApply()
 					)
 				);
 
-				// Good to go here
-				if ($smcFunc['db_num_rows']($request2) == 1);
+				// How many labels do you have?
+				list ($num_labels) = $smcFunc['db_fetch_assoc']($request2);
+
+				if ($num_labels > 0);
 					$context['can_remove_inbox'] = true;
 
 				$smcFunc['db_free_result']($request2);