diff --git a/client/components/Message.vue b/client/components/Message.vue
index 11c7c13f..8d47cd32 100644
--- a/client/components/Message.vue
+++ b/client/components/Message.vue
@@ -1,7 +1,10 @@
 <template>
 	<div
 		:id="'msg-' + message.id"
-		:class="['msg', {self: message.self, highlight: message.highlight}]"
+		:class="[
+			'msg',
+			{self: message.self, highlight: message.highlight, 'previous-source': isPreviousSource},
+		]"
 		:data-type="message.type"
 		:data-from="message.from && message.from.nick"
 	>
@@ -87,6 +90,7 @@ export default {
 		channel: Object,
 		network: Object,
 		keepScrollPosition: Function,
+		isPreviousSource: Boolean,
 	},
 	computed: {
 		messageTime() {
diff --git a/client/components/MessageList.vue b/client/components/MessageList.vue
index 9c8fec3e..1e8794ab 100644
--- a/client/components/MessageList.vue
+++ b/client/components/MessageList.vue
@@ -46,6 +46,7 @@
 					:network="network"
 					:message="message"
 					:keep-scroll-position="keepScrollPosition"
+					:is-previous-source="isPreviousSource(message, id)"
 					@linkPreviewToggle="onLinkPreviewToggle"
 				/>
 			</template>
@@ -212,6 +213,16 @@ export default {
 
 			return false;
 		},
+		isPreviousSource(currentMessage, id) {
+			const previousMessage = this.condensedMessages[id - 1];
+			return (
+				previousMessage &&
+				currentMessage.type === "message" &&
+				previousMessage.type === "message" &&
+				previousMessage.from &&
+				currentMessage.from.nick === previousMessage.from.nick
+			);
+		},
 		onCopy() {
 			clipboard(this.$el);
 		},