diff --git a/mod/share.php b/mod/share.php
index 792ee4008..8392cad8d 100644
--- a/mod/share.php
+++ b/mod/share.php
@@ -20,6 +20,8 @@
  */
 
 use Friendica\App;
+use Friendica\Content\Text\BBCode;
+use Friendica\Core\Protocol;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\DI;
@@ -33,7 +35,8 @@ function share_init(App $a) {
 		System::exit();
 	}
 
-	$fields = ['private', 'body', 'uri'];
+	$fields = ['private', 'body', 'author-name', 'author-link', 'author-avatar',
+		'guid', 'created', 'plink', 'uri', 'title', 'network'];
 	$item = Post::selectFirst($fields, ['id' => $post_id]);
 
 	if (!DBA::isResult($item) || $item['private'] == Item::PRIVATE) {
@@ -43,8 +46,17 @@ function share_init(App $a) {
 	if (strpos($item['body'], "[/share]") !== false) {
 		$pos = strpos($item['body'], "[share");
 		$o = substr($item['body'], $pos);
-	} else {
+	} elseif (in_array($item['network'], Protocol::FEDERATED)) {
 		$o = "[share]" . $item['uri'] . "[/share]";
+	} else {
+		$o = BBCode::getShareOpeningTag($item['author-name'], $item['author-link'], $item['author-avatar'], $item['plink'], $item['created'], $item['guid']);
+
+		if ($item['title']) {
+			$o .= '[h3]'.$item['title'].'[/h3]'."\n";
+		}
+
+		$o .= $item['body'];
+		$o .= "[/share]";
 	}
 
 	echo $o;