diff --git a/lib/util.php b/lib/util.php
index 6e9e4533cf..0841288be1 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -1089,7 +1089,7 @@ function common_save_replies($notice) {
 		if (!$recipient) {
 			continue;
 		}
-		if ($i == 0 && ($recipient->id != $sender->id)) { # Don't save reply to self
+		if ($i == 0 && ($recipient->id != $sender->id) && !$notice->reply_to) { # Don't save reply to self
 			$reply_for = $recipient;
 			$recipient_notice = $reply_for->getCurrentNotice();
 			if ($recipient_notice) {