diff --git a/plugins/yetiforce/yetiforce.php b/plugins/yetiforce/yetiforce.php
index 7b4c1b24..77b067c8 100644
--- a/plugins/yetiforce/yetiforce.php
+++ b/plugins/yetiforce/yetiforce.php
@@ -1082,7 +1082,7 @@ public function messageObjects(array $p): array
 			foreach ($rows as $row) {
 				if (1 !== (int) $row['status']) {
 					$row['type'] = (int) $row['type'];
-					$row['isBlack'] = \App\Mail\Rbl::LIST_TYPE_BLACK_LIST === $sender['type'] || \App\Mail\Rbl::LIST_TYPE_PUBLIC_BLACK_LIST === $sender['type'];
+					$row['isBlack'] = \App\Mail\Rbl::LIST_TYPE_BLACK_LIST === $row['type'] || \App\Mail\Rbl::LIST_TYPE_PUBLIC_BLACK_LIST === $row['type'];
 					$sender = $row;
 					break;
 				}
@@ -1098,8 +1098,8 @@ public function messageObjects(array $p): array
 			$alert .= html::span(['class' => 'float-right'], '<button class="btn btn-sm" type="button" data-toggle="collapse" data-target="#alert_collapse" aria-expanded="false" aria-controls="alert_collapse"><span class="fas fa-chevron-circle-down h3"></span></button>');
 			$alert .= html::span(null, $this->rc->gettext('LBL_ALERT_FAKE_SENDER'));
 			$alert .= html::span(['class' => 'd-block'], html::span(['class' => 'collapse ' . $collapseShow, 'id' => 'alert_collapse'], html::tag('button', [
-					'onclick' => "return rcmail.command('plugin.yetiforce.loadMailAnalysis')",
-					'title' => $this->gettext('addvcardmsg'),
+				'onclick' => "return rcmail.command('plugin.yetiforce.loadMailAnalysis')",
+				'title' => $this->gettext('addvcardmsg'),
 				'class' => 'fakeMail float-right',
 			], rcube::Q($this->rc->gettext('BTN_ANALYSIS_DETAILS'))) . $desc));
 			$p['content'][] = html::div(['class' => 'aligned-buttons boxerror'],
@@ -1136,13 +1136,13 @@ public function messageObjects(array $p): array
 		}
 		if ($sender) {
 			$type = \App\Mail\Rbl::LIST_TYPES[$sender['type']];
-					$p['content'][] = html::p(['class' => 'mail-type-alert', 'style' => 'background:' . $type['alertColor']],
+			$p['content'][] = html::p(['class' => 'mail-type-alert', 'style' => 'background:' . $type['alertColor']],
 							html::span(['class' => 'alert-icon ' . $type['icon']], '') .
 				html::span(null, rcube::Q($this->rc->gettext($sender['isBlack'] ? 'LBL_ALERT_BLACK_LIST' : 'LBL_ALERT_WHITE_LIST')))
 						);
-					return $p;
-				}
-			$p['content'][] = html::p(['class' => 'mail-type-alert', 'style' => 'background: #eaeaea'],
+			return $p;
+		}
+		$p['content'][] = html::p(['class' => 'mail-type-alert', 'style' => 'background: #eaeaea'],
 				html::span(['class' => 'alert-icon far fa-question-circle mr-2'], '') .
 				html::span(null, rcube::Q($this->rc->gettext('LBL_ALERT_NEUTRAL_LIST')))
 			);
diff --git a/version.php b/version.php
index 4a7d3724..359af6a1 100644
--- a/version.php
+++ b/version.php
@@ -1,6 +1,6 @@
 <?php
 
 return [
-	'patch' => '2020.12.04',
-	'version' => '0.1.7'
+	'patch' => '2020.12.16',
+	'version' => '0.1.8'
 ];