diff --git a/mod/item.php b/mod/item.php
index 5bb4b1b73c..21dfb45607 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -545,7 +545,7 @@ function item_content(&$a) {
 			// generate a resource-id and therefore aren't intimately linked to the item. 
 
 			if(strlen($item['resource-id'])) {
-				$q("DELETE FROM `photo` WHERE `resource-id` = '%s' AND `uid` = %d ",
+				q("DELETE FROM `photo` WHERE `resource-id` = '%s' AND `uid` = %d ",
 					dbesc($item['resource-id']),
 					intval($item['uid'])
 				);
diff --git a/mod/message.php b/mod/message.php
index c004b3d63b..ef3be2c5e9 100644
--- a/mod/message.php
+++ b/mod/message.php
@@ -87,10 +87,11 @@ function message_post(&$a) {
 				$image_uri = substr($image,strrpos($image,'/') + 1);
 				$image_uri = substr($image_uri,0, strpos($image_uri,'-'));
 				$r = q("UPDATE `photo` SET `allow_cid` = '%s'
-					WHERE `resource-id` = '%s' AND `album` = '%s' ",
+					WHERE `resource-id` = '%s' AND `album` = '%s' AND `uid` = %d ",
 					dbesc('<' . $recipient . '>'),
 					dbesc($image_uri),
-					dbesc( t('Wall Photos'))
+					dbesc( t('Wall Photos')),
+					intval(local_user())
 				); 
 			}
 		}