diff --git a/src/config.h b/src/config.h
index ec44118..da902c4 100644
--- a/src/config.h
+++ b/src/config.h
@@ -13,7 +13,7 @@
 
 #define VERSION "1.2.0-master"
 
-#define BUILD 933
+#define BUILD 934
 
 #define HOSTID "mailarchiver"
 
diff --git a/src/parser.c b/src/parser.c
index 5d02f9b..ac4374c 100644
--- a/src/parser.c
+++ b/src/parser.c
@@ -677,15 +677,12 @@
 
       if(puf[0] == '\0') continue;
 
+      strncat(puf, " ", sizeof(puf)-strlen(puf)-1);
+
+      if(strncasecmp(puf, "http://", 7) == 0 || strncasecmp(puf, "https://", 8) == 0) fixURL(puf, sizeof(puf)-1);
+
       len = strlen(puf);
 
-      strncat(puf, " ", sizeof(puf)-len-1);
-
-      if(strncasecmp(puf, "http://", 7) == 0 || strncasecmp(puf, "https://", 8) == 0){
-         fixURL(puf, sizeof(puf)-1);
-         len = strlen(puf);
-      }
-
       if(state->is_header == 0 && strncmp(puf, "__URL__", 7) && (puf[0] == ' ' || (len > MAX_WORD_LEN && cfg->enable_cjk == 0) || isHexNumber(puf)) ) continue;