diff --git a/include/oembed.php b/include/oembed.php
index 69583167cf..a793bd8006 100755
--- a/include/oembed.php
+++ b/include/oembed.php
@@ -210,7 +210,7 @@ function oembed_iframe($src,$width,$height) {
 	$a = get_app();
 
 	$s = $a->get_baseurl()."/oembed/".base64url_encode($src);
-	return '<iframe height="' . $height . '" width="' . $width . '" src="' . $s . '" frameborder="no" >' . t('Embedded content') . '</iframe>';
+	return '<iframe class="embed_rich" height="' . $height . '" width="' . $width . '" src="' . $s . '" frameborder="no" >' . t('Embedded content') . '</iframe>';
 
 }
 
diff --git a/mod/ping.php b/mod/ping.php
index a475c558c7..ee5be67f6b 100644
--- a/mod/ping.php
+++ b/mod/ping.php
@@ -1,5 +1,6 @@
 <?php
 require_once("include/datetime.php");
+require_once('include/bbcode.php');
 
 
 function ping_init(&$a) {
@@ -191,8 +192,6 @@ function ping_init(&$a) {
 
 		$tot = $mail+$intro+$register+count($comments)+count($likes)+count($dislikes)+count($friends)+count($posts)+count($tags);
 
-		require_once('include/bbcode.php');
-
 		if($firehose) {
 			echo '	<notif count="'.$tot.'">';
 		}
@@ -208,17 +207,17 @@ function ping_init(&$a) {
 
 			if ($intro>0){
 				foreach ($intros as $i) {
-					echo xmlize( $a->get_baseurl().'/notifications/intros/'.$i['id'], $i['name'], $i['url'], $i['photo'], relative_date($i['datetime']), 'notify-unseen',t("{0} wants to be your friend") );
+					echo xmlize($a->get_baseurl().'/notifications/intros/'.$i['id'], $i['name'], $i['url'], $i['photo'], relative_date($i['datetime']), 'notify-unseen', "&rarr; ".t("{0} wants to be your friend"));
 				};
 			}
 			if ($mail>0){
 				foreach ($mails as $i) {
-					echo xmlize( $a->get_baseurl().'/message/'.$i['id'], $i['from-name'], $i['from-url'], $i['from-photo'], relative_date($i['created']), 'notify-unseen',t("{0} sent you a message") );
+					echo xmlize($a->get_baseurl().'/message/'.$i['id'], $i['from-name'], $i['from-url'], $i['from-photo'], relative_date($i['created']), 'notify-unseen',"&rarr; ".t("{0} sent you a message"));
 				};
 			}
 			if ($register>0){
 				foreach ($regs as $i) {
-					echo xmlize( $a->get_baseurl().'/admin/users/', $i['name'], $i['url'], $i['micro'], relative_date($i['created']), 'notify-unseen',t("{0} requested registration") );
+					echo xmlize($a->get_baseurl().'/admin/users/', $i['name'], $i['url'], $i['micro'], relative_date($i['created']), 'notify-unseen', "&rarr; ".t("{0} requested registration"));
 				};
 			}
 
@@ -349,6 +348,9 @@ function ping_get_notifications($uid, $regularnotifications) {
 			if (is_null($notification["deleted"]))
 				$notification["deleted"] = 0;
 
+			$notification["msg"] = strip_tags(bbcode($notification["msg"]));
+			$notification["name"] = strip_tags(bbcode($notification["name"]));
+
 			// Replace the name with {0} but ensure to make that only once
 			// The {0} is used later and prints the name in bold.
 			// But don't do it for the android app.
diff --git a/view/global.css b/view/global.css
index c61ded6ae8..628bac7cfc 100644
--- a/view/global.css
+++ b/view/global.css
@@ -84,6 +84,10 @@ span.connector {
   position: relative;
 }
 
+.embed_rich {
+  display: block;
+}
+
 /* Shared Messages */
 .shared_header {
   height: 32px;