diff --git a/snappymail/v/0.0.0/app/templates/Views/User/MailMessageView.html b/snappymail/v/0.0.0/app/templates/Views/User/MailMessageView.html
index 81b804924..68a3d1b1d 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/MailMessageView.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/MailMessageView.html
@@ -281,8 +281,15 @@
 
 						<div class="showImages" data-bind="visible: message().hasImages()">
 							<div class="btn" data-bind="click: showImages" data-icon="🖼" data-i18n="MESSAGE/BUTTON_SHOW_IMAGES"></div>
-							<div data-bind="foreach: message().whitelistOptions()">
-								<div class="btn" data-bind="click: $root.whitelistText, text: $data" data-icon="🖼"></div>
+							<div class="btn-group" data-bind="registerBootstrapDropdown: true" style="display: inline-block">
+								<a class="btn dropdown-toggle" id="whitelist-dropdown-id" data-icon="🖼" href="#" tabindex="-1"><span data-i18n="SETTINGS_GENERAL/IMAGES_WHITELIST"></span> ▼</a>
+								<menu class="dropdown-menu right-edge" role="menu" aria-labelledby="whitelist-dropdown-id">
+									<!-- ko foreach: message().whitelistOptions() -->
+									<li role="presentation">
+										<a href="#" tabindex="-1" data-bind="click: $root.whitelistText, text: $data"></a>
+									</li>
+									<!-- /ko -->
+								</menu>
 							</div>
 						</div>
 					</div>