diff --git a/src/bluewave.c b/src/bluewave.c
index fc0c696..83fb5c5 100644
--- a/src/bluewave.c
+++ b/src/bluewave.c
@@ -778,6 +778,7 @@ void bwave_upload_reply() {
 	int area;
 	tWORD msg_attr;
 	struct fido_addr addr;
+	stralloc sa = EMPTY_STRALLOC;
 	char *body;
 	char *tagline;
 	struct stat s;
@@ -1053,20 +1054,20 @@ void bwave_upload_reply() {
 						snprintf(originlinebuffer, 256, "\r");
 					}
 
-					body = file2str(msgbuffer);
-					if (body == NULL) {
+					sa = file2stralloc(msgbuffer);
+					if (sa.s == NULL) {
 						continue;
 					}
+					stralloc_cats(&sa, originlinebuffer);
+					stralloc_0(&sa);
+					body = sa.s;
+					char *p, *s;
 
-					strcat(body, originlinebuffer);
-
-					bpos = 0;
-					for (i = 0; i < strlen(body); i++) {
-						if (body[i] != '\n') {
-							body[bpos++] = body[i];
-						}
+					for (p = s = body; *p != '\0'; ++p) {
+						if (*p != '\n')
+							*s++ = *p;
 					}
-					body[bpos] = '\0';
+					*s = '\0';
 
 					if (bwave_add_message(confr, area, convertl(upl_rec.unix_date), upl_rec.to, upl_rec.subj, &addr, body) != 0) {
 						// failed to add message