diff --git a/include/enotify.php b/include/enotify.php
index 99bc0fd32..2c940f614 100644
--- a/include/enotify.php
+++ b/include/enotify.php
@@ -27,8 +27,12 @@ function notification($params) {
 	$hostname = $a->get_hostname();
 	if(strpos($hostname,':'))
 		$hostname = substr($hostname,0,strpos($hostname,':'));
-
-	$sender_email = t('noreply') . '@' . $hostname;
+	
+	// $sender_email = t('noreply') . '@' . $hostname;
+	$sender_email = $a->config['sender_email'];
+	if (empty($sender_email)) {
+		$sender_email = t('noreply') . '@' . $hostname;
+	}
 
 	$user = q("SELECT `nickname` FROM `user` WHERE `uid` = %d", intval($params['uid']));
 	if ($user)