diff --git a/modules/announcements.php b/modules/announcements.php
index aaab4541..70070e99 100644
--- a/modules/announcements.php
+++ b/modules/announcements.php
@@ -124,7 +124,7 @@ class announcements extends module_base
 		$total_announcements = 1;
 
 		// Fetch announcements from portal functions.php with check if "read full" is requested.
-		$portal_announcement_length = ($announcement < 0) ? $this->config['board3_announcements_length_' . $module_id] : 0;
+		$portal_announcement_length = ($announcement < 0 && !$this->config['board3_announcements_style_' . $module_id]) ? $this->config['board3_announcements_length_' . $module_id] : 0;
 		$this->fetch_posts->set_module_id($module_id);
 		$fetch_news = $this->fetch_posts->get_posts(
 			$this->config['board3_global_announcements_forum_' . $module_id],
diff --git a/modules/news.php b/modules/news.php
index e3e430e3..26258b40 100644
--- a/modules/news.php
+++ b/modules/news.php
@@ -125,7 +125,7 @@ class news extends module_base
 		$total_news = 1;
 
 		// Fetch news from portal functions.php with check if "read full" is requested.
-		$portal_news_length = ($news < 0) ? $this->config['board3_news_length_' . $module_id] : 0;
+		$portal_news_length = ($news < 0 && !$this->config['board3_news_style_' . $module_id]) ? $this->config['board3_news_length_' . $module_id] : 0;
 		$this->fetch_posts->set_module_id($module_id);
 		$fetch_news = $this->fetch_posts->get_posts(
 			$this->config['board3_news_forum_' . $module_id],
diff --git a/portal/fetch_posts.php b/portal/fetch_posts.php
index 56d02fb6..cc7b8a24 100644
--- a/portal/fetch_posts.php
+++ b/portal/fetch_posts.php
@@ -623,7 +623,7 @@ class fetch_posts
 	 */
 	protected function format_message($row, $text_length, &$posts_striped)
 	{
-		if (($text_length !== 0) && (strlen($row['post_text']) > $text_length))
+		if ($text_length > 0 && (strlen($row['post_text']) > $text_length))
 		{
 			$message = str_replace(array("\n", "\r"), array('<br />', "\n"), $row['post_text']);
 			$message = get_sub_taged_string($message, $row['bbcode_uid'], $text_length);