diff --git a/handle.c b/handle.c
index 49011f5..ab482fd 100644
--- a/handle.c
+++ b/handle.c
@@ -294,14 +294,16 @@ static void handlePrivmsg(struct Message *msg) {
 	bool notice = (msg->cmd[0] == 'N');
 	bool action = isAction(msg);
 	bool mention = !mine && isMention(msg);
+	const char *italic = (action ? "\35" : "");
+	const char *reverse = (mention ? "\26" : "");
 	uiFormat(
 		id, (!notice && (mention || query) ? Hot : Warm), tagTime(msg),
-		"%s\3%d%s%s%s\17\t%s",
-		(mention ? "\26" : ""),
-		hash(msg->user),
+		"%s%s\3%d%s%s%s\3%s\t%s",
+		italic, reverse, hash(msg->user),
 		(action ? "* " : notice ? "-" : "<"),
 		msg->nick,
 		(action ? "" : notice ? "-" : ">"),
+		reverse,
 		msg->params[1]
 	);
 }
diff --git a/ui.c b/ui.c
index b0e30b9..9f0bb88 100644
--- a/ui.c
+++ b/ui.c
@@ -39,7 +39,7 @@
 #undef lines
 
 #ifndef A_ITALIC
-#define A_ITALIC A_UNDERLINE
+#define A_ITALIC A_NORMAL
 #endif
 
 #define BOTTOM (LINES - 1)