3 files changed, 6 insertions, 4 deletions
diff --git a/protocols/msn/Makefile b/protocols/msn/Makefile
index dd5d46e2..5d199b9e 100644
--- a/protocols/msn/Makefile
+++ b/protocols/msn/Makefile
@@ -9,7 +9,7 @@
 -include ../../Makefile.settings
 
 # [SH] Program variables
-objects = msn.o msn_util.o ns.o passport.o sb.o tables.o invitation.o
+objects = invitation.o msn.o msn_util.o ns.o passport.o sb.o tables.o
 
 CFLAGS += -Wall
 LFLAGS += -r
diff --git a/protocols/msn/msn.c b/protocols/msn/msn.c
index 590a1382..b17a0bfa 100644
--- a/protocols/msn/msn.c
+++ b/protocols/msn/msn.c
@@ -77,7 +77,7 @@ static void msn_logout( struct im_connection *ic )
 	if( md )
 	{
 		while( md->filetransfers ) {
-			imcb_file_canceled( md->filetransfers->data, "Closing msn connection" );
+			imcb_file_canceled( md->filetransfers->data, "Closing connection" );
 		}
 		
 		if( md->fd >= 0 )
diff --git a/protocols/msn/sb.c b/protocols/msn/sb.c
index b60a9a8b..c3302e57 100644
--- a/protocols/msn/sb.c
+++ b/protocols/msn/sb.c
@@ -173,11 +173,13 @@ int msn_sb_sendmessage( struct msn_switchboard *sb, char *text )
 			i = strlen( MSN_TYPING_HEADERS ) + strlen( sb->ic->acc->user );
 			buf = g_new0( char, i );
 			i = g_snprintf( buf, i, MSN_TYPING_HEADERS, sb->ic->acc->user );
-		} else if( strncmp( text, MSN_INVITE_HEADERS, sizeof( MSN_INVITE_HEADERS ) - 1 ) == 0 ) 
+		}
+		else if( strncmp( text, MSN_INVITE_HEADERS, sizeof( MSN_INVITE_HEADERS ) - 1 ) == 0 ) 
 		{
 			buf = g_strdup( text );
 			i = strlen( buf );
-		} else
+		}
+		else
 		{
 			buf = g_new0( char, sizeof( MSN_MESSAGE_HEADERS ) + strlen( text ) * 2 + 1 );
 			i = strlen( MSN_MESSAGE_HEADERS );