diff --git a/Makefile.am b/Makefile.am
index 98f5e5c9..be86db46 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,7 +9,7 @@ profanity_SOURCES = src/command.c src/contact.c src/command_history.c \
 	src/accounts.c src/accounts.h src/jid.h src/jid.c \
 	src/xmpp/xmpp.h src/xmpp/capabilities.c src/xmpp/connection.c \
 	src/xmpp/iq.c src/xmpp/message.c src/xmpp/presence.c src/xmpp/stanza.c \
-	src/xmpp/stanza.h \
+	src/xmpp/stanza.h src/xmpp/message.h \
 	src/ui/ui.h src/ui/window.c src/ui/window.h src/ui/windows.c \
 	src/ui/titlebar.c src/ui/statusbar.c src/ui/inputwin.c
 
diff --git a/src/xmpp/connection.c b/src/xmpp/connection.c
index 18f54183..7f13f288 100644
--- a/src/xmpp/connection.c
+++ b/src/xmpp/connection.c
@@ -36,6 +36,7 @@
 #include "muc.h"
 #include "xmpp.h"
 #include "stanza.h"
+#include "message.h"
 
 static struct _jabber_conn_t {
     xmpp_log_t *log;
diff --git a/src/xmpp/message.c b/src/xmpp/message.c
index 2851bde4..6769147f 100644
--- a/src/xmpp/message.c
+++ b/src/xmpp/message.c
@@ -32,6 +32,7 @@
 #include "profanity.h"
 #include "xmpp.h"
 #include "stanza.h"
+#include "message.h"
 
 #define HANDLE(ns, type, func) xmpp_handler_add(conn, func, ns, STANZA_NAME_MESSAGE, type, ctx)
 
diff --git a/src/xmpp/message.h b/src/xmpp/message.h
new file mode 100644
index 00000000..639ae558
--- /dev/null
+++ b/src/xmpp/message.h
@@ -0,0 +1,28 @@
+/*
+ * message.h
+ *
+ * Copyright (C) 2012, 2013 James Booth <boothj5@gmail.com>
+ *
+ * This file is part of Profanity.
+ *
+ * Profanity is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Profanity is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Profanity.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifndef MESSAGE_H
+#define MESSAGE_H
+
+void message_add_handlers(void);
+
+#endif
diff --git a/src/xmpp/xmpp.h b/src/xmpp/xmpp.h
index 94db67de..661f0c80 100644
--- a/src/xmpp/xmpp.h
+++ b/src/xmpp/xmpp.h
@@ -74,7 +74,6 @@ void jabber_conn_set_presence_message(const char * const message);
 char* jabber_get_account_name(void);
 
 // message functions
-void message_add_handlers(void);
 void message_send(const char * const msg, const char * const recipient);
 void message_send_groupchat(const char * const msg, const char * const recipient);
 void message_send_inactive(const char * const recipient);