diff --git a/src/fe-common/irc/fe-irc-commands.c b/src/fe-common/irc/fe-irc-commands.c
index fa8d9a2f..d406fa30 100644
--- a/src/fe-common/irc/fe-irc-commands.c
+++ b/src/fe-common/irc/fe-irc-commands.c
@@ -248,6 +248,26 @@ static void cmd_nctcp(const char *data, IRC_SERVER_REC *server)
 	g_free(params);
 }
 
+static void cmd_wall(const char *data, IRC_SERVER_REC *server, WI_IRC_REC *item)
+{
+	char *params, *channame, *msg;
+	CHANNEL_REC *chanrec;
+
+	g_return_if_fail(data != NULL);
+	if (server == NULL || !server->connected || !irc_server_check(server))
+		cmd_return_error(CMDERR_NOT_CONNECTED);
+
+	params = cmd_get_params(data, 2 | PARAM_FLAG_OPTCHAN | PARAM_FLAG_GETREST, item, &channame, &msg);
+	if (*msg == '\0') cmd_param_error(CMDERR_NOT_ENOUGH_PARAMS);
+
+	chanrec = channel_find(server, channame);
+	if (chanrec == NULL) cmd_param_error(CMDERR_CHAN_NOT_FOUND);
+
+	printformat(server, chanrec->name, MSGLEVEL_NOTICES, IRCTXT_OWN_WALL, chanrec->name, msg);
+
+	g_free(params);
+}
+
 static void cmd_ban(const char *data, IRC_SERVER_REC *server, WI_IRC_REC *item)
 {
 	CHANNEL_REC *cur_channel, *channel;
@@ -393,6 +413,7 @@ void fe_irc_commands_init(void)
 	command_bind("notice", NULL, (SIGNAL_FUNC) cmd_notice);
 	command_bind("ctcp", NULL, (SIGNAL_FUNC) cmd_ctcp);
 	command_bind("nctcp", NULL, (SIGNAL_FUNC) cmd_nctcp);
+	command_bind("wall", NULL, (SIGNAL_FUNC) cmd_wall);
 	command_bind("ban", NULL, (SIGNAL_FUNC) cmd_ban);
 	command_bind("invitelist", NULL, (SIGNAL_FUNC) cmd_invitelist);
 	command_bind("join", NULL, (SIGNAL_FUNC) cmd_join);
@@ -411,6 +432,7 @@ void fe_irc_commands_deinit(void)
 	command_unbind("notice", (SIGNAL_FUNC) cmd_notice);
 	command_unbind("ctcp", (SIGNAL_FUNC) cmd_ctcp);
 	command_unbind("nctcp", (SIGNAL_FUNC) cmd_nctcp);
+	command_unbind("wall", (SIGNAL_FUNC) cmd_wall);
 	command_unbind("ban", (SIGNAL_FUNC) cmd_ban);
 	command_unbind("invitelist", (SIGNAL_FUNC) cmd_invitelist);
 	command_unbind("join", (SIGNAL_FUNC) cmd_join);
diff --git a/src/fe-common/irc/module-formats.c b/src/fe-common/irc/module-formats.c
index c20089ff..244ec7f1 100644
--- a/src/fe-common/irc/module-formats.c
+++ b/src/fe-common/irc/module-formats.c
@@ -142,6 +142,7 @@ FORMAT_REC fecommon_irc_formats[] = {
 	{ "own_notice", "%K[%rnotice%K(%R$0%K)]%n $1", 2, { 0, 0 } },
 	{ "own_me", "%W * $0%n $1", 2, { 0, 0 } },
 	{ "own_ctcp", "%K[%rctcp%K(%R$0%K)]%n $1 $2", 3, { 0, 0, 0 } },
+	{ "own_wall", "%K[%WWall%K/%c$0%K]%n $1", 2, { 0, 0 } },
 
 	/* ---- */
 	{ NULL, "Received messages", 0 },
diff --git a/src/fe-common/irc/module-formats.h b/src/fe-common/irc/module-formats.h
index d4210461..e5fc2def 100644
--- a/src/fe-common/irc/module-formats.h
+++ b/src/fe-common/irc/module-formats.h
@@ -116,7 +116,8 @@ enum {
 	IRCTXT_OWN_NOTICE,
 	IRCTXT_OWN_ME,
 	IRCTXT_OWN_CTCP,
-
+	IRCTXT_OWN_WALL,
+	
 	IRCTXT_FILL_7,
 
 	IRCTXT_PUBMSG_ME,
diff --git a/src/irc/core/irc-commands.c b/src/irc/core/irc-commands.c
index b2571896..77e678e9 100644
--- a/src/irc/core/irc-commands.c
+++ b/src/irc/core/irc-commands.c
@@ -547,7 +547,7 @@ static void cmd_wall_hash(gpointer key, NICK_REC *nick, GSList **nicks)
 
 static void cmd_wall(const char *data, IRC_SERVER_REC *server, WI_IRC_REC *item)
 {
-	char *params, *channame, *msg;
+	char *params, *channame, *msg, *args;
 	CHANNEL_REC *chanrec;
 	GSList *tmp, *nicks;
 
@@ -565,11 +565,17 @@ static void cmd_wall(const char *data, IRC_SERVER_REC *server, WI_IRC_REC *item)
 	nicks = NULL;
 	g_hash_table_foreach(chanrec->nicks, (GHFunc) cmd_wall_hash, &nicks);
 
+	args = g_strconcat(chanrec->name, " ", msg, NULL);
+	msg = parse_special_string(settings_get_str("wall_format"), server, item, args, NULL);
+	g_free(args);
+
 	for (tmp = nicks; tmp != NULL; tmp = tmp->next) {
 		NICK_REC *rec = tmp->data;
 
-		irc_send_cmdv(server, "NOTICE %s :%s", rec->nick, msg);
+		if (g_strcasecmp(rec->nick, server->nick) != 0)
+			irc_send_cmdv(server, "NOTICE %s :%s", rec->nick, msg);
 	}
+	g_free(msg);
 	g_slist_free(nicks);
 
 	g_free(params);
@@ -772,6 +778,7 @@ void irc_commands_init(void)
 
 	settings_add_str("misc", "quit_message", "leaving");
 	settings_add_int("misc", "knockout_time", 300);
+	settings_add_str("misc", "wall_format", "[Wall/$0] $1");
 
 	knockout_tag = g_timeout_add(KNOCKOUT_TIMECHECK, (GSourceFunc) knockout_timeout, NULL);