Index: bp-activity.php
===================================================================
--- bp-activity.php	(revision 1635)
+++ bp-activity.php	(working copy)
@@ -198,7 +198,7 @@
 			}
 		}
 		
-		if ( $pos ) {
+		if ( !$pos = strpos( $content, '<span' ) ) {
 			$before = substr( $content, 0, $pos );
 			$after = substr( $content, $pos, strlen( $content ) );