diff --git a/src/www_msgs.c b/src/www_msgs.c
index f3a36f6..c600202 100644
--- a/src/www_msgs.c
+++ b/src/www_msgs.c
@@ -1062,7 +1062,7 @@ int www_send_msg(struct user_record *user, char *to, char *subj, int conference,
 		sz = iconv(ic, &inbuf, &inc, &oubuf, &ouc);
 		free(body3);
 
-		if (JAM_AddMessage(jb, &jmh, jsp, (char *)body2, strlen(body2))) {
+		if (JAM_AddMessage(jb, &jmh, jsp, (char *)body2, oubuf - body2)) {
 			free(body2);	
 			JAM_UnlockMB(jb);
 			JAM_DelSubPacket(jsp);