Merge https://github.com/redmatrix/hubzilla into pending_merge

1 files changed, 6 insertions, 0 deletions

diff --git a/include/items.php b/include/items.php
index 7793d1fb2..e7cc02579 100755
--- a/include/items.php
+++ b/include/items.php
@@ -3522,11 +3522,17 @@ function mail_store($arr) {
 		dbesc($arr['mid']),
 		intval($arr['channel_id'])
 	);
+
 	if($r) {
 		logger('mail_store: duplicate item ignored. ' . print_r($arr,true));
 		return 0;
 	}
 
+	if(! $r && $arr['mail_recalled'] == 1) {
+		logger('mail_store: recalled item not found. ' . print_r($arr,true));
+		return 0;
+	}
+
 	call_hooks('post_mail',$arr);
 
 	if(x($arr,'cancel')) {