clean up mails properly

main.go

@@ -84,24 +84,41 @@ func cleanString(i string) (s string, err error) {
 	s = sanitize.Accents(s)
 	s = sanitize.HTML(s)
 	s = strings.ToLower(s)
+
+	s = strings.Replace(s, "boundary=", " ", -1)
+	s = strings.Replace(s, "charset", " ", -1)
+	s = strings.Replace(s, "content-transfer-encoding", " ", -1)
+	s = strings.Replace(s, "content-type", " ", -1)
+	s = strings.Replace(s, "cp-850", " ", -1)
+	s = strings.Replace(s, "image/jpeg", " ", -1)
+	s = strings.Replace(s, "multipart/alternative", " ", -1)
+	s = strings.Replace(s, "multipart/related", " ", -1)
+	s = strings.Replace(s, "name=", " ", -1)
+	s = strings.Replace(s, "nextpart", " ", -1)
+	s = strings.Replace(s, "quoted-printable", " ", -1)
+	s = strings.Replace(s, "text/html", " ", -1)
+	s = strings.Replace(s, "text/plain", " ", -1)
+	s = strings.Replace(s, "this email must be viewed in html mode", " ", -1)
+	s = strings.Replace(s, "this is a multi-part message in mime format", " ", -1)
+	s = strings.Replace(s, "windows-1251", " ", -1)
+	s = strings.Replace(s, "windows-1252", " ", -1)
+
 	s = strings.Replace(s, "!", " ", -1)
 	s = strings.Replace(s, "#", " ", -1)
 	s = strings.Replace(s, "$", " ", -1)
 	s = strings.Replace(s, "%", " ", -1)
 	s = strings.Replace(s, "&", " ", -1)
+	s = strings.Replace(s, "'", "", -1)
 	s = strings.Replace(s, "(", " ", -1)
 	s = strings.Replace(s, ")", " ", -1)
 	s = strings.Replace(s, "*", " ", -1)
 	s = strings.Replace(s, "+", " ", -1)
 	s = strings.Replace(s, ",", " ", -1)
-	s = strings.Replace(s, "-", " ", -1)
-	s = strings.Replace(s, ".", " ", -1)
-	s = strings.Replace(s, "/", " ", -1)
-	s = strings.Replace(s, ":", " ", -1)
-	s = strings.Replace(s, ";", " ", -1)
+	s = strings.Replace(s, ". ", " ", -1)
 	s = strings.Replace(s, "<", " ", -1)
 	s = strings.Replace(s, "=", " ", -1)
 	s = strings.Replace(s, ">", " ", -1)
+	s = strings.Replace(s, "?", " ", -1)
 	s = strings.Replace(s, "@", " ", -1)
 	s = strings.Replace(s, "[", " ", -1)
 	s = strings.Replace(s, "\"", " ", -1)
@@ -115,16 +132,6 @@ func cleanString(i string) (s string, err error) {
 	s = strings.Replace(s, "|", " ", -1)
 	s = strings.Replace(s, "}", " ", -1)
 
-	s = strings.Replace(s, "this is a multi part message in mime format", " ", -1)
-	s = strings.Replace(s, "nextpart", " ", -1)
-	s = strings.Replace(s, "content type", " ", -1)
-	s = strings.Replace(s, "text plain", " ", -1)
-	s = strings.Replace(s, "charset", " ", -1)
-	s = strings.Replace(s, "content transfer encoding", " ", -1)
-	s = strings.Replace(s, "quoted printable", " ", -1)
-	s = strings.Replace(s, "text html", " ", -1)
-	s = strings.Replace(s, "cp 850", " ", -1)
-
 	for i := 0; i < 10; i++ {
 		s = strings.Replace(s, "  ", " ", -1)
 	}