diff --git a/src/common/cfgfiles.c b/src/common/cfgfiles.c
index 60540245..b714eb18 100644
--- a/src/common/cfgfiles.c
+++ b/src/common/cfgfiles.c
@@ -1381,3 +1381,22 @@ hexchat_open_gfile (const char *filename)
 
 	return file;
 }
+
+G_GNUC_PRINTF (2, 3)
+gsize
+stream_writef (GOutputStream *ostream, const char *fmt, ...)
+{
+	char *tmp;
+	va_list args;
+	gint len;
+	gsize ret;
+
+	va_start (args, fmt);
+	len = g_vasprintf (&tmp, fmt, args);
+	va_end (args);
+
+	ret = g_output_stream_write (ostream, tmp, len, NULL, NULL);
+	g_free (tmp);
+	
+	return ret;
+}
diff --git a/src/common/cfgfiles.h b/src/common/cfgfiles.h
index 17f2edb9..884b0cca 100644
--- a/src/common/cfgfiles.h
+++ b/src/common/cfgfiles.h
@@ -51,6 +51,7 @@ int cmd_set (session *sess, char *tbuf, char *word[], char *word_eol[]);
 int hexchat_open_file (char *file, int flags, int mode, int xof_flags);
 FILE *hexchat_fopen_file (const char *file, const char *mode, int xof_flags);
 GFile *hexchat_open_gfile (const char *filename);
+gsize stream_writef (GOutputStream *ostream, const char *fmt, ...) G_GNUC_PRINTF (2, 3);
 
 #define XOF_DOMODE 1
 #define XOF_FULLPATH 2
diff --git a/src/common/servlist.c b/src/common/servlist.c
index 21db91de..167f70dc 100644
--- a/src/common/servlist.c
+++ b/src/common/servlist.c
@@ -1332,21 +1332,6 @@ servlist_check_encoding (char *charset)
 	return FALSE;
 }
 
-G_GNUC_PRINTF (2, 3)
-static gsize
-servlist_writeline (GOutputStream *ostream, const char *fmt, ...)
-{
-	char buf[512];
-	va_list args;
-	gsize len;
-
-	va_start (args, fmt);
-	len = g_vsnprintf (buf, sizeof (buf), fmt, args);
-	va_end (args);
-
-	return g_output_stream_write (ostream, buf, len, NULL, NULL);
-}
-
 int
 servlist_save (void)
 {
@@ -1369,30 +1354,30 @@ servlist_save (void)
 	if (!ostream)
 		return FALSE;
 
-	servlist_writeline (ostream, "v=%s\n\n", PACKAGE_VERSION);
+	stream_writef (ostream, "v=%s\n\n", PACKAGE_VERSION);
 
 	list = network_list;
 	while (list)
 	{
 		net = list->data;
 
-		servlist_writeline (ostream, "N=%s\n", net->name);
+		stream_writef (ostream, "N=%s\n", net->name);
 		if (net->nick)
-			servlist_writeline (ostream, "I=%s\n", net->nick);
+			stream_writef (ostream, "I=%s\n", net->nick);
 		if (net->nick2)
-			servlist_writeline (ostream, "i=%s\n", net->nick2);
+			stream_writef (ostream, "i=%s\n", net->nick2);
 		if (net->user)
-			servlist_writeline (ostream, "U=%s\n", net->user);
+			stream_writef (ostream, "U=%s\n", net->user);
 		if (net->real)
-			servlist_writeline (ostream, "R=%s\n", net->real);
+			stream_writef (ostream, "R=%s\n", net->real);
 		if (net->pass)
-			servlist_writeline (ostream, "P=%s\n", net->pass);
+			stream_writef (ostream, "P=%s\n", net->pass);
 		if (net->logintype)
-			servlist_writeline (ostream, "L=%d\n", net->logintype);
+			stream_writef (ostream, "L=%d\n", net->logintype);
 		if (net->encoding && g_ascii_strcasecmp (net->encoding, "System") &&
 			 g_ascii_strcasecmp (net->encoding, "System default"))
 		{
-			servlist_writeline (ostream, "E=%s\n", net->encoding);
+			stream_writef (ostream, "E=%s\n", net->encoding);
 			if (!servlist_check_encoding (net->encoding))
 			{
 				buf = g_strdup_printf (_("Warning: \"%s\" character set is unknown. No conversion will be applied for network %s."),
@@ -1402,13 +1387,13 @@ servlist_save (void)
 			}
 		}
 
-		servlist_writeline (ostream, "F=%d\nD=%d\n", net->flags, net->selected);
+		stream_writef (ostream, "F=%d\nD=%d\n", net->flags, net->selected);
 
 		netlist = net->servlist;
 		while (netlist)
 		{
 			serv = netlist->data;
-			servlist_writeline (ostream, "S=%s\n", serv->hostname);
+			stream_writef (ostream, "S=%s\n", serv->hostname);
 			netlist = netlist->next;
 		}
 
@@ -1416,7 +1401,7 @@ servlist_save (void)
 		while (cmdlist)
 		{
 			cmd = cmdlist->data;
-			servlist_writeline (ostream, "C=%s\n", cmd->command);
+			stream_writef (ostream, "C=%s\n", cmd->command);
 			cmdlist = cmdlist->next;
 		}
 
@@ -1427,17 +1412,17 @@ servlist_save (void)
 
 			if (favchan->key)
 			{
-				servlist_writeline (ostream, "J=%s,%s\n", favchan->name, favchan->key);
+				stream_writef (ostream, "J=%s,%s\n", favchan->name, favchan->key);
 			}
 			else
 			{
-				servlist_writeline (ostream, "J=%s\n", favchan->name);
+				stream_writef (ostream, "J=%s\n", favchan->name);
 			}
 
 			favlist = favlist->next;
 		}
 
-		if (!servlist_writeline (ostream, "\n"))
+		if (!stream_writef (ostream, "\n"))
 			return FALSE;
 
 		list = list->next;