diff --git a/classes/Command.php b/classes/Command.php
index ead6a56cc1..e5dc59313d 100644
--- a/classes/Command.php
+++ b/classes/Command.php
@@ -133,7 +133,14 @@ class FavCommand extends Command {
 			return;
 		}
 
-		mail_notify_fave($recipient, $this->user, $notice);
+	    $other = User::staticGet('id', $recipient->id);
+		
+		if ($other && $other->id != $user->id) {
+			if ($other->email && $other->emailnotifyfav) {
+				mail_notify_fave($other, $this->user, $notice);
+			}
+		}
+		
 		$this->user->blowFavesCache();
 		
 		$channel->output($this->user, _('Notice marked as fave.'));