diff --git a/client/css/style.css b/client/css/style.css
index 9a76d48d..3c4532a4 100644
--- a/client/css/style.css
+++ b/client/css/style.css
@@ -1137,7 +1137,6 @@ kbd {
 }
 
 #chat .from {
-	border-right: 1px solid #f6f6f6;
 	color: #b1c3ce;
 	padding-right: 10px;
 	text-align: right;
@@ -1152,6 +1151,7 @@ kbd {
 	min-width: 0;
 	padding-left: 10px;
 	padding-right: 6px;
+	border-left: 1px solid #f6f6f6;
 	overflow: hidden; /* Prevents Zalgo text to expand beyond messages */
 }
 
diff --git a/client/themes/morning.css b/client/themes/morning.css
index 0b576e8d..d3d85bc6 100644
--- a/client/themes/morning.css
+++ b/client/themes/morning.css
@@ -39,7 +39,7 @@ body {
 }
 
 /* Borders */
-#chat .from,
+#chat .content,
 #windows .header,
 #chat .user-mode::before,
 #chat .sidebar {
diff --git a/client/themes/zenburn.css b/client/themes/zenburn.css
index e4823cdf..0b7ef712 100644
--- a/client/themes/zenburn.css
+++ b/client/themes/zenburn.css
@@ -65,7 +65,7 @@ body {
 }
 
 /* Borders */
-#chat .from,
+#chat .content,
 #windows .header,
 #chat .user-mode::before,
 #chat .sidebar {
diff --git a/src/plugins/irc-events/motd.js b/src/plugins/irc-events/motd.js
index 03743d92..001bbf1a 100644
--- a/src/plugins/irc-events/motd.js
+++ b/src/plugins/irc-events/motd.js
@@ -9,7 +9,7 @@ module.exports = function(irc, network) {
 		const lobby = network.channels[0];
 
 		if (data.motd) {
-			data.motd.split("\n").forEach((text) => {
+			data.motd.trim().split("\n").forEach((text) => {
 				const msg = new Msg({
 					type: Msg.Type.MOTD,
 					text: text,