diff --git a/file/style/be.bastelstu.chat.less b/file/style/be.bastelstu.chat.less
index fe31fd2..593b20f 100644
--- a/file/style/be.bastelstu.chat.less
+++ b/file/style/be.bastelstu.chat.less
@@ -187,7 +187,7 @@
 							
 							.timsChatUsernameContainer {
 								// sender username
-								> span:first-child {
+								> span:not(.icon):not(.receiver) {
 									font-weight: bold;
 								}
 							}
diff --git a/template/message.tpl b/template/message.tpl
index 2b2db0f..f072838 100644
--- a/template/message.tpl
+++ b/template/message.tpl
@@ -29,7 +29,7 @@
 			
 				{if $message.type == $messageTypes.WHISPER}
 					<span class="icon icon16 icon-double-angle-right jsTooltip pointer" title="{/literal}{lang}chat.global.whispers{/lang}{literal}" onclick="be.bastelstu.Chat.insertText('/whisper {if $message.receiver == WCF.User.userID}{$message.username.replace("\\", "\\\\").replace("'", "\\'")}{else}{$message.additionalData.receiverUsername.replace("\\", "\\\\").replace("'", "\\'")}{/if}, ', { append: false });"></span>
-					<span class="reciever">{$message.additionalData.receiverUsername}</span>
+					<span class="receiver">{$message.additionalData.receiverUsername}</span>
 				{/if}
 			</span>