diff --git a/include/api.php b/include/api.php
index 667629e139..555315bd86 100644
--- a/include/api.php
+++ b/include/api.php
@@ -944,7 +944,7 @@
 		//$include_entities = (x($_REQUEST,'include_entities')?$_REQUEST['include_entities']:false);
 
 		$r = q("SELECT `item`.*, `item`.`id` AS `item_id`, `contact`.`nick` as `reply_author`,
-			`contact`.`name`, `contact`.`photo`, `contact`.`url` as `reply_url`, `contact`.`rel`,
+			`contact`.`name`, `contact`.`photo` as `reply_photo`, `contact`.`url` as `reply_url`, `contact`.`rel`,
 			`contact`.`network`, `contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`,
 			`contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`
 			FROM `item`, `contact`
@@ -957,7 +957,18 @@
 		);
 
 		if ($r[0]['body'] != "") {
-			$_REQUEST['body'] = html_entity_decode("♲ ", ENT_QUOTES, 'UTF-8')."[url=".$r[0]['reply_url']."]".$r[0]['reply_author']."[/url] \n".$r[0]['body'];
+			if (intval(get_config('system','new_share'))) {
+				$post = "[share author='".str_replace("'", "'", $r[0]['reply_author']).
+						"' profile='".$r[0]['reply_url'].
+						"' avatar='".$r[0]['reply_photo'].
+						"' link='".$r[0]['plink']."']";
+
+				$post .= $r[0]['body'];
+				$post .= "[/share]";
+				$_REQUEST['body'] = $post;
+			} else
+				$_REQUEST['body'] = html_entity_decode("♲ ", ENT_QUOTES, 'UTF-8')."[url=".$r[0]['reply_url']."]".$r[0]['reply_author']."[/url] \n".$r[0]['body'];
+
 			$_REQUEST['profile_uid'] = api_user();
 			$_REQUEST['type'] = 'wall';
 			$_REQUEST['api_source'] = true;
diff --git a/view/theme/vier/style.css b/view/theme/vier/style.css
index 1701e8ac4c..f97fc2f590 100644
--- a/view/theme/vier/style.css
+++ b/view/theme/vier/style.css
@@ -1258,7 +1258,8 @@ border-bottom: 1px solid #D2D2D2;
 
 #profile-jot-form #profile-jot-text {
   height: 2.0em;
-  width: 99%;
+  /* width: 99%; */
+  width: 752px;
   font-size: 15px;
   color: #999999;
   border: 1px solid #DDD;
@@ -1272,7 +1273,8 @@ border-bottom: 1px solid #D2D2D2;
     font-weight: bold;
     height: 20px;
     margin: 0 0 5px;
-    width: 60%;
+    /* width: 60%; */
+    width: 762px;
     border: 1px solid #d2d2d2;
 }