diff --git a/src/Model/Post/Media.php b/src/Model/Post/Media.php
index b253e516e7..06935f8067 100644
--- a/src/Model/Post/Media.php
+++ b/src/Model/Post/Media.php
@@ -28,6 +28,8 @@ use Friendica\Core\System;
 use Friendica\Database\Database;
 use Friendica\Database\DBA;
 use Friendica\DI;
+use Friendica\Model\Item;
+use Friendica\Model\Post;
 use Friendica\Util\Images;
 use Friendica\Util\ParseUrl;
 use Friendica\Util\Strings;
@@ -519,4 +521,43 @@ class Media
 		}
 		return $attachments;
 	}
+
+	/**
+	 * Add media attachments to the body
+	 *
+	 * @param int $uriid
+	 * @return string body
+	 */
+	public static function addAttachmentsToBody(int $uriid)
+	{
+		$item = Post::selectFirst(['body'], ['uri-id' => $uriid]);
+		if (!DBA::isResult($item)) {
+			return '';
+		}
+		$body = preg_replace("/\s*\[attachment .*?\].*?\[\/attachment\]\s*/ism", '', $item['body']);
+
+		foreach (self::getByURIId($uriid, [self::IMAGE, self::AUDIO, self::VIDEO]) as $media) {
+			if (Item::containsLink($body, $media['url'])) {
+				continue;
+			}
+
+			if ($media['type'] == self::IMAGE) {
+				if (!empty($media['description'])) {
+					$body .= "\n[img=" . $media['url'] . ']' . $media['description'] .'[/img]';
+				} else {
+					$body .= "\n[img]" . $media['url'] .'[/img]';
+				}
+			} elseif ($media['type'] == self::AUDIO) {
+				$body .= "\n[audio]" . $media['url'] . "[/audio]\n";
+			} elseif ($media['type'] == self::VIDEO) {
+				$body .= "\n[video]" . $media['url'] . "[/video]\n";
+			}
+		}
+
+		if (preg_match("/.*(\[attachment.*?\].*?\[\/attachment\]).*/ism", $item['body'], $match)) {
+			$body .= "\n" . $match[1];
+		}
+
+		return $body;
+	}
 }
diff --git a/src/Protocol/DFRN.php b/src/Protocol/DFRN.php
index 5eee17e52d..0c348610e2 100644
--- a/src/Protocol/DFRN.php
+++ b/src/Protocol/DFRN.php
@@ -899,10 +899,10 @@ class DFRN
 			$entry->setAttribute("xmlns:statusnet", ActivityNamespace::STATUSNET);
 		}
 
+		$body = Post\Media::addAttachmentsToBody($item['uri-id']);
+
 		if ($item['private'] == Item::PRIVATE) {
-			$body = Item::fixPrivatePhotos($item['body'], $owner['uid'], $item, $cid);
-		} else {
-			$body = $item['body'];
+			$body = Item::fixPrivatePhotos($body, $owner['uid'], $item, $cid);
 		}
 
 		// Remove the abstract element. It is only locally important.
diff --git a/src/Protocol/Diaspora.php b/src/Protocol/Diaspora.php
index 4ad70eac0c..36c97cdea0 100644
--- a/src/Protocol/Diaspora.php
+++ b/src/Protocol/Diaspora.php
@@ -3366,36 +3366,6 @@ class Diaspora
 		return $eventdata;
 	}
 
-	/**
-	 * Add media attachments to the body
-	 *
-	 * @param array $item
-	 * @return string body
-	 */
-	private static function addAttachments(array $item)
-	{
-		$body = $item['body'];
-
-		foreach (Post\Media::getByURIId($item['uri-id'], [Post\Media::IMAGE, Post\Media::AUDIO, Post\Media::VIDEO]) as $media) {
-			if (Item::containsLink($item['body'], $media['url'])) {
-				continue;
-			}
-
-			if ($media['type'] == Post\Media::IMAGE) {
-				if (!empty($media['description'])) {
-					$body .= "\n[img=" . $media['url'] . ']' . $media['description'] .'[/img]';
-				} else {
-					$body .= "\n[img]" . $media['url'] .'[/img]';
-				}
-			} elseif ($media['type'] == Post\Media::AUDIO) {
-				$body .= "\n[audio]" . $media['url'] . "[/audio]\n";
-			} elseif ($media['type'] == Post\Media::VIDEO) {
-				$body .= "\n[video]" . $media['url'] . "[/video]\n";
-			}
-		}
-		return $body;
-	}
-
 	/**
 	 * Create a post (status message or reshare)
 	 *
@@ -3436,7 +3406,7 @@ class Diaspora
 			$type = "reshare";
 		} else {
 			$title = $item["title"];
-			$body = self::addAttachments($item);
+			$body = Post\Media::addAttachmentsToBody($item['uri-id']);
 
 			// Fetch the title from an attached link - if there is one
 			if (empty($item["title"]) && DI::pConfig()->get($owner['uid'], 'system', 'attach_link_title')) {
@@ -3650,7 +3620,7 @@ class Diaspora
 			$thread_parent_item = Post::selectFirst(['guid', 'author-id', 'author-link', 'gravity'], ['uri' => $item['thr-parent'], 'uid' => $item['uid']]);
 		}
 
-		$body = self::addAttachments($item);
+		$body = Post\Media::addAttachmentsToBody($item['uri-id']);
 
 		// The replied to autor mention is prepended for clarity if:
 		// - Item replied isn't yours