Index: src/protocols/msn/nexus.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/msn/nexus.c,v
retrieving revision 1.3
diff -u -p -r1.3 nexus.c
--- src/protocols/msn/nexus.c	13 May 2004 17:25:37 -0000	1.3
+++ src/protocols/msn/nexus.c	24 May 2004 14:50:48 -0000
@@ -127,7 +127,7 @@ login_connect_cb(gpointer data, GaimSslC
 
 	if ((s = msn_ssl_read(gsc, &buffer)) <= 0)
 	{
-		gaim_connection_error(gc, _("Unable to write to MSN Nexus server."));
+		gaim_connection_error(gc, _("Unable to read from MSN Nexus server."));
 		return;
 	}
 
Index: src/protocols/msn/utils.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/msn/utils.c,v
retrieving revision 1.17
diff -u -p -r1.17 utils.c
--- src/protocols/msn/utils.c	13 May 2004 17:22:11 -0000	1.17
+++ src/protocols/msn/utils.c	24 May 2004 14:50:48 -0000
@@ -285,6 +285,11 @@ msn_import_html(const char *html, char *
 				msg[retcount++] = '>';
 				c += 4;
 			}
+			else if (!g_ascii_strncasecmp(c, "&nbsp;", 6))
+			{
+				msg[retcount++] = ' ';
+				c += 6;
+			}
 			else if (!g_ascii_strncasecmp(c, "&quot;", 6))
 			{
 				msg[retcount++] = '"';
@@ -295,6 +300,13 @@ msn_import_html(const char *html, char *
 				msg[retcount++] = '&';
 				c += 5;
 			}
+			else if (!g_ascii_strncasecmp(c, "&apos;", 6))
+			{
+				msg[retcount++] = '\'';
+				c += 6;
+			}
+			else
+				msg[retcount++] = *c++;
 		}
 		else
 			msg[retcount++] = *c++;