diff --git a/src/common/inbound.c b/src/common/inbound.c
index e738fc8a..81962e91 100644
--- a/src/common/inbound.c
+++ b/src/common/inbound.c
@@ -136,7 +136,7 @@ inbound_open_dialog (server *serv, char *from,
 }
 
 static void
-inbound_make_idtext (server *serv, char *idtext, int max, int id)
+inbound_make_idtext (server *serv, char *idtext, int max, gboolean id)
 {
 	idtext[0] = 0;
 	if (serv->have_idmsg || serv->have_accnotify)
@@ -154,7 +154,7 @@ inbound_make_idtext (server *serv, char *idtext, int max, int id)
 }
 
 void
-inbound_privmsg (server *serv, char *from, char *to, char *ip, char *text, int id,
+inbound_privmsg (server *serv, char *from, char *to, char *ip, char *text, gboolean id,
 					  const message_tags_data *tags_data)
 {
 	session *sess;
@@ -352,7 +352,7 @@ is_hilight (char *from, char *text, session *sess, server *serv)
 
 void
 inbound_action (session *sess, char *chan, char *from, char *ip, char *text,
-					 int fromme, gboolean fake, int id, const message_tags_data *tags_data)
+					 gboolean fromme, gboolean fake, gboolean id, const message_tags_data *tags_data)
 {
 	server *serv = sess->server;
 	struct User *user;
@@ -460,7 +460,7 @@ inbound_action (session *sess, char *chan, char *from, char *ip, char *text,
 
 void
 inbound_chanmsg (server *serv, session *sess, char *chan, char *from, 
-					  char *text, char fromme, int id, 
+					  char *text, gboolean fromme, gboolean id,
 					  const message_tags_data *tags_data)
 {
 	struct User *user;
@@ -990,7 +990,7 @@ find_session_from_type (int type, server *serv)
 }
 
 void
-inbound_notice (server *serv, char *to, char *nick, char *msg, char *ip, int id,
+inbound_notice (server *serv, char *to, char *nick, char *msg, char *ip, gboolean id,
 					 const message_tags_data *tags_data)
 {
 	char *po,*ptr=to;
diff --git a/src/common/inbound.h b/src/common/inbound.h
index bb2df301..064e180f 100644
--- a/src/common/inbound.h
+++ b/src/common/inbound.h
@@ -37,7 +37,7 @@ void inbound_ukick (server *serv, char *chan, char *kicker, char *reason,
 void inbound_kick (server *serv, char *chan, char *user, char *kicker,
 						 char *reason, const message_tags_data *tags_data);
 void inbound_notice (server *serv, char *to, char *nick, char *msg, char *ip,
-							int id, const message_tags_data *tags_data);
+							gboolean id, const message_tags_data *tags_data);
 void inbound_quit (server *serv, char *nick, char *ip, char *reason,
 						 const message_tags_data *tags_data);
 void inbound_topicnew (server *serv, char *nick, char *chan, char *topic,
@@ -76,14 +76,14 @@ void inbound_login_start (session *sess, char *nick, char *servname,
 void inbound_login_end (session *sess, char *text,
 								const message_tags_data *tags_data);
 void inbound_chanmsg (server *serv, session *sess, char *chan, char *from,
-							 char *text, char fromme, int id, 
+							 char *text, gboolean fromme, gboolean id,
 							 const message_tags_data *tags_data);
 void clear_channel (session *sess);
 void set_topic (session *sess, char *topic, char *stripped_topic);
-void inbound_privmsg (server *serv, char *from, char *to, char *ip, char *text, int id,
+void inbound_privmsg (server *serv, char *from, char *to, char *ip, char *text, gboolean id,
 							 const message_tags_data *tags_data);
 void inbound_action (session *sess, char *chan, char *from, char *ip,
-							char *text, int fromme, gboolean fake, int id,
+							char *text, gboolean fromme, gboolean fake, gboolean id,
 							const message_tags_data *tags_data);
 void inbound_newnick (server *serv, char *nick, char *newnick, int quiet,
 							 const message_tags_data *tags_data);