diff --git a/apps/app_minivm.c b/apps/app_minivm.c
index 14729c8d137fdf2c6ec909faee7aebe167188320..a868bac831d22c75daaad10af70c793e47a1bdae 100644
--- a/apps/app_minivm.c
+++ b/apps/app_minivm.c
@@ -2275,11 +2275,11 @@ static char *message_template_parse_emailbody(const char *configuration)
 	       int len = strlen("\n");
 	       switch (tmpwrite[1]) {
 	       case 'n':
-		      strncpy(tmpwrite+len, tmpwrite+2, strlen(tmpwrite+2)+1);
+		      memmove(tmpwrite + len, tmpwrite + 2, strlen(tmpwrite + 2) + 1);
 		      strncpy(tmpwrite, "\n", len);
 		      break;
 	       case 't':
-		      strncpy(tmpwrite+len, tmpwrite+2, strlen(tmpwrite+2)+1);
+		      memmove(tmpwrite + len, tmpwrite + 2, strlen(tmpwrite + 2) + 1);
 		      strncpy(tmpwrite, "\t", len);
 		      break;
 	       default: