diff --git a/include/text.php b/include/text.php
index 5e189d58f1..3375a33b61 100644
--- a/include/text.php
+++ b/include/text.php
@@ -1249,7 +1249,7 @@ function prepare_body(array &$item, $attach = false, $is_preview = false)
 
 	// Compile eventual content filter reasons
 	$filter_reasons = [];
-	if (!$is_preview && !($item['self'] && local_user() == $item['uid'])) {
+	if (!$is_preview && public_contact() != $item['author-id']) {
 		if (!empty($item['content-warning']) && (!local_user() || !PConfig::get(local_user(), 'system', 'disable_cw', false))) {
 			$filter_reasons[] = L10n::t('Content warning: %s', $item['content-warning']);
 		}