diff --git a/actions/favor.php b/actions/favor.php
index 7718f84d2d..dd61899e4b 100644
--- a/actions/favor.php
+++ b/actions/favor.php
@@ -83,30 +83,11 @@ class FavorAction extends Action {
 	    $other = User::staticGet('id', $notice->profile_id);
 		if ($other && $other->id != $user->id) {
 			if ($other->email && $other->emailnotifyfav) {
-				$this->notify_mail($other, $user, $notice);
+				mail_notify_fave($other, $user, $notice);
 			}
 			# XXX: notify by IM
 			# XXX: notify by SMS
 		}
 	}
 
-	function notify_mail($other, $user, $notice) {
-		$profile = $user->getProfile();
-		$bestname = $profile->getBestName();
-		$subject = sprintf(_('%s added your notice as a favorite'), $bestname);
-		$body = sprintf(_("%1\$s just added your notice from %2\$s as one of their favorites.\n\n" .
-						  "In case you forgot, you can see the text of your notice here:\n\n" .
-						  "%3\$s\n\n" .
-						  "You can see the list of %1\$s's favorites here:\n\n" .
-						  "%4\$s\n\n" .
-						  "Faithfully yours,\n" .
-						  "%5\$s\n"),
-						$bestname,
-						common_exact_date($notice->created),
-						common_local_url('shownotice', array('notice' => $notice->id)),
-						common_local_url('showfavorites', array('nickname' => $user->nickname)),
-						common_config('site', 'name'));
-
-		mail_to_user($other, $subject, $body);
-	}
 }
\ No newline at end of file
diff --git a/lib/mail.php b/lib/mail.php
index 827e48e811..b6ce1fe22c 100644
--- a/lib/mail.php
+++ b/lib/mail.php
@@ -267,3 +267,24 @@ function mail_notify_message($message, $from=NULL, $to=NULL) {
 	
 	return mail_to_user($to, $subject, $body);
 }
+
+function mail_notify_fave($other, $user, $notice) {
+	$profile = $user->getProfile();
+	$bestname = $profile->getBestName();
+	$subject = sprintf(_('%s added your notice as a favorite'), $bestname);
+	$body = sprintf(_("%1\$s just added your notice from %2\$s as one of their favorites.\n\n" .
+					  "In case you forgot, you can see the text of your notice here:\n\n" .
+					  "%3\$s\n\n" .
+					  "You can see the list of %1\$s's favorites here:\n\n" .
+					  "%4\$s\n\n" .
+					  "Faithfully yours,\n" .
+					  "%5\$s\n"),
+					$bestname,
+					common_exact_date($notice->created),
+					common_local_url('shownotice', array('notice' => $notice->id)),
+					common_local_url('showfavorites', array('nickname' => $user->nickname)),
+					common_config('site', 'name'));
+	
+	mail_to_user($other, $subject, $body);
+}
+  
\ No newline at end of file