diff --git a/src/Makefile.openbsd b/src/Makefile.openbsd
index e0a1904..7a5c365 100644
--- a/src/Makefile.openbsd
+++ b/src/Makefile.openbsd
@@ -31,7 +31,7 @@ $(CDK):
 	cd ../deps/cdk-5.0-20161210/ && $(MAKE)
 
 $(UUID):
-	rm ../deps/libuuid/ltmain.sh ../deps/libuuid/libtool
+	rm ../deps/libuuid/ltmain.sh ../deps/libuuid/libtool || true
 	cd ../deps/libuuid/ && libtoolize
 	cd ../deps/libuuid/ && ./configure
 	cd ../deps/libuuid/ && $(MAKE)
diff --git a/src/Makefile.openbsd.WWW b/src/Makefile.openbsd.WWW
index ec9518d..b5efc46 100644
--- a/src/Makefile.openbsd.WWW
+++ b/src/Makefile.openbsd.WWW
@@ -36,7 +36,7 @@ $(CDK):
 	cd ../deps/cdk-5.0-20161210/ && $(MAKE)
 
 $(UUID):
-	rm ../deps/libuuid/ltmain.sh ../deps/libuuid/libtool
+	rm ../deps/libuuid/ltmain.sh ../deps/libuuid/libtool || true
 	cd ../deps/libuuid/ && libtoolize
 	cd ../deps/libuuid/ && ./configure
 	cd ../deps/libuuid/ && $(MAKE)
diff --git a/src/www_msgs.c b/src/www_msgs.c
index c600202..c22be90 100644
--- a/src/www_msgs.c
+++ b/src/www_msgs.c
@@ -491,6 +491,13 @@ char *www_msgs_messageview(struct user_record *user, int conference, int area, i
 		} else {
 			sprintf(buffer, "<div class=\"msg-view-date\">Date: %.2d:%.2d %.2d-%.2d-%.2d</div>\n", msg_date.tm_hour, msg_date.tm_min, msg_date.tm_mday, msg_date.tm_mon + 1, msg_date.tm_year - 100);
 		}
+		
+		if (len + strlen(buffer) > max_len - 1) {
+			max_len += 4096;
+			page = (char *)realloc(page, max_len);
+		}	
+		strcat(page, buffer);
+		len += strlen(buffer);
 
 		sprintf(buffer, "<div class=\"msg-view-options\"><a href=\"%smsgs/flag/%d/%d/%d\"><img src=\"%sstatic/flag.png\" /></a></div>", conf.www_url, conference, area, msg, conf.www_url);
 		if (len + strlen(buffer) > max_len - 1) {