Fix for https://bugs.cacert.org/view.php?id=569

"output order when removing email address"

includes/account.php

@@ -149,8 +149,13 @@
 		$delcount = 0;
 		if(array_key_exists('delid',$_REQUEST) && is_array($_REQUEST['delid']))
 		{
+			$deltitle=false;
 			foreach($_REQUEST['delid'] as $id)
 			{
+				if (!$deltitle) {
+					echo _('The following email addresses have been removed:')."<br>\n";
+					$deltitle=true;
+				}
 				$id = intval($id);
 				$query = "select * from `email` where `id`='$id' and `memid`='".intval($_SESSION['profile']['id'])."' and
 						`email`!='".$_SESSION['profile']['email']."'";
@@ -168,11 +173,9 @@
 		{
 			echo _("You did not select any email accounts for removal.");
 		}
-		if($delcount > 0)
+		if(0 == $delcount)
 		{
-			echo _("The following accounts have been removed:")."<br>\n";
+			echo _("You did not select any accounts to be removed, or you attempted to remove the default account. No action was taken.");
-		} else {
-			echo _("You failed to select any accounts to be removed, or you attempted to remove the default account. No action was taken.");
 		}
 
 		showfooter();