diff --git a/src/plugins/irc/irc-channel.c b/src/plugins/irc/irc-channel.c
index 88c9effbc..a64212bf0 100644
--- a/src/plugins/irc/irc-channel.c
+++ b/src/plugins/irc/irc-channel.c
@@ -1361,7 +1361,7 @@ irc_channel_join_smart_filtered_unmask (struct t_irc_channel *channel,
 void
 irc_channel_rejoin (struct t_irc_server *server, struct t_irc_channel *channel)
 {
-    char join_args[256];
+    char join_args[1024];
 
     snprintf (join_args, sizeof (join_args), "%s%s%s",
               channel->name,
diff --git a/src/plugins/irc/irc-command.c b/src/plugins/irc/irc-command.c
index 307635129..20e83aa94 100644
--- a/src/plugins/irc/irc-command.c
+++ b/src/plugins/irc/irc-command.c
@@ -1885,7 +1885,7 @@ IRC_COMMAND_CALLBACK(dcc)
     socklen_t length;
     struct t_infolist *infolist;
     struct t_infolist_item *item;
-    char str_address[NI_MAXHOST], charset_modifier[256];
+    char str_address[NI_MAXHOST], charset_modifier[1024];
     int rc;
 
     IRC_BUFFER_GET_SERVER_CHANNEL(buffer);
diff --git a/src/plugins/irc/irc-ctcp.c b/src/plugins/irc/irc-ctcp.c
index 645c67443..921c4831d 100644
--- a/src/plugins/irc/irc-ctcp.c
+++ b/src/plugins/irc/irc-ctcp.c
@@ -558,7 +558,7 @@ irc_ctcp_recv_dcc (struct t_irc_server *server, const char *nick,
     char *pos_start_resume, *filename;
     struct t_infolist *infolist;
     struct t_infolist_item *item;
-    char charset_modifier[256];
+    char charset_modifier[1024];
 
     if (!arguments || !arguments[0])
         return;
diff --git a/src/plugins/irc/irc-server.c b/src/plugins/irc/irc-server.c
index abcba968c..a53ab1a72 100644
--- a/src/plugins/irc/irc-server.c
+++ b/src/plugins/irc/irc-server.c
@@ -2301,7 +2301,7 @@ int
 irc_server_rename (struct t_irc_server *server, const char *new_name)
 {
     int length;
-    char *mask, *pos_option, *new_option_name, charset_modifier[256];
+    char *mask, *pos_option, *new_option_name, charset_modifier[1024];
     char *buffer_name;
     const char *option_name;
     struct t_infolist *infolist;
@@ -2715,7 +2715,7 @@ irc_server_send_one_msg (struct t_irc_server *server, int flags,
     static char buffer[4096];
     const char *ptr_msg, *ptr_chan_nick;
     char *new_msg, *pos, *tags_to_send, *msg_encoded;
-    char str_modifier[128], modifier_data[256];
+    char str_modifier[128], modifier_data[1024];
     int rc, queue_msg, add_to_queue, first_message, anti_flood;
     int pos_channel, pos_text, pos_encode;
     time_t time_now;
@@ -3231,7 +3231,7 @@ irc_server_msgq_flush ()
     char *ptr_data, *new_msg, *new_msg2, *ptr_msg, *ptr_msg2, *pos;
     char *nick, *host, *command, *channel, *arguments;
     char *msg_decoded, *msg_decoded_without_color;
-    char str_modifier[128], modifier_data[256];
+    char str_modifier[128], modifier_data[1024];
     int pos_channel, pos_text, pos_decode;
 
     while (irc_recv_msgq)
@@ -4436,7 +4436,7 @@ irc_server_set_buffer_title (struct t_irc_server *server)
 struct t_gui_buffer *
 irc_server_create_buffer (struct t_irc_server *server)
 {
-    char buffer_name[256], charset_modifier[256];
+    char buffer_name[1024], charset_modifier[1024];
     struct t_gui_buffer *ptr_buffer_for_merge;
 
     ptr_buffer_for_merge = NULL;