--- gaim-0.80.orig/src/conversation.c
+++ gaim-0.80/src/conversation.c
@@ -1384,6 +1384,7 @@
 	GaimConvWindow *win;
 	GaimBuddy *b;
 	GaimUnseenState unseen;
+	char tmp[BUF_LONG];
 	/* int logging_font_options = 0; */
 
 	g_return_if_fail(conv    != NULL);
@@ -1448,7 +1449,15 @@
 
 	if (gaim_conversation_is_logging(conv))
 		gaim_log_write(conv->log, flags, who, mtime, message);
-	ops->write_conv(conv, who, message, flags, mtime);
+	if (!(flags & GAIM_MESSAGE_SYSTEM)) { 
+		if (strstr(message, "\n") || strstr(message, "<br>"))
+			g_snprintf(tmp, sizeof(tmp),"\n%s",message);
+		else
+			g_snprintf(tmp, sizeof(tmp),"\n  %s",message);
+		ops->write_conv(conv, who, tmp, flags, mtime);
+	} else {
+		ops->write_conv(conv, who, message, flags, mtime);
+	}
 
 	win = gaim_conversation_get_window(conv);