diff --git bp-activity/bp-activity-functions.php bp-activity/bp-activity-functions.php
index 519d004..dd68612 100644
--- bp-activity/bp-activity-functions.php
+++ bp-activity/bp-activity-functions.php
@@ -1283,8 +1283,8 @@ function bp_activity_thumbnail_content_images( $content, $link = false ) {
 	global $post;
 
 	preg_match_all( '/<img[^>]*>/Ui', $content, $matches );
-	$content = preg_replace('/<img[^>]*>/Ui', '', $content );
-
+	$content = preg_replace('|(\[caption(.*?)\])?<img[^>]*>(\[/caption\])?|', '', $content );
+	
 	if ( !empty( $matches ) && !empty( $matches[0] ) ) {
 		// Get the SRC value
 		preg_match( '/<img.*?(src\=[\'|"]{0,1}.*?[\'|"]{0,1})[\s|>]{1}/i', $matches[0][0], $src );