diff --git a/src/Content/Item.php b/src/Content/Item.php
index 539814655f..d1cdbc679b 100644
--- a/src/Content/Item.php
+++ b/src/Content/Item.php
@@ -666,8 +666,16 @@ class Item
 			$shared_content .= '[h3]' . $item['title'] . "[/h3]\n";
 		}
 
+		$shared = BBCode::fetchShareAttributes($item['body']);
+
+		$item['body'] = Post\Media::addAttachmentsToBody($item['uri-id'], $item['body'], [Post\Media::IMAGE]);
+
 		// If it is a reshared post then reformat it to avoid display problems with two share elements
 		if (Diaspora::isReshare($item['body'], false)) {
+			if (!empty($shared['guid']) && ($encaspulated_share = self::createSharedPostByGuid($shared['guid']))) {
+				$item['body'] = preg_replace("/\[share.*?\](.*)\[\/share\]/ism", $encaspulated_share, $item['body']);
+			}
+	
 			$item['body'] = HTML::toBBCode(BBCode::convertForUriId($item['uri-id'], $item['body'], BBCode::ACTIVITYPUB));
 		}
 
diff --git a/src/Model/Post/Media.php b/src/Model/Post/Media.php
index 8fb10ddd88..ce00b205c5 100644
--- a/src/Model/Post/Media.php
+++ b/src/Model/Post/Media.php
@@ -648,11 +648,13 @@ class Media
 	/**
 	 * Add media attachments to the body
 	 *
-	 * @param int $uriid
+	 * @param int    $uriid
 	 * @param string $body
+	 * @param array  $types
+	 *
 	 * @return string body
 	 */
-	public static function addAttachmentsToBody(int $uriid, string $body = ''): string
+	public static function addAttachmentsToBody(int $uriid, string $body = '', array $types = [self::IMAGE, self::AUDIO, self::VIDEO]): string
 	{
 		if (empty($body)) {
 			$item = Post::selectFirst(['body'], ['uri-id' => $uriid]);
@@ -665,7 +667,7 @@ class Media
 
 		$body = preg_replace("/\s*\[attachment .*?\].*?\[\/attachment\]\s*/ism", '', $body);
 
-		foreach (self::getByURIId($uriid, [self::IMAGE, self::AUDIO, self::VIDEO]) as $media) {
+		foreach (self::getByURIId($uriid, $types) as $media) {
 			if (Item::containsLink($body, $media['preview'] ?? $media['url'], $media['type'])) {
 				continue;
 			}