diff --git a/app/src/main/java/javax/mail/internet/HeaderTokenizer.java b/app/src/main/java/javax/mail/internet/HeaderTokenizer.java
index e5bafe3cf9..1080ba9be6 100644
--- a/app/src/main/java/javax/mail/internet/HeaderTokenizer.java
+++ b/app/src/main/java/javax/mail/internet/HeaderTokenizer.java
@@ -255,6 +255,10 @@ public class HeaderTokenizer {
 	return string.substring(nextPos);
     }
 
+	public int getNextPos() {
+		return nextPos;
+	}
+
     /*
      * Return the next token starting from 'currentPos'. After the
      * parse, 'currentPos' is updated to point to the start of the 
diff --git a/app/src/main/java/javax/mail/internet/ParameterList.java b/app/src/main/java/javax/mail/internet/ParameterList.java
index 5509b39569..5ff40ab720 100644
--- a/app/src/main/java/javax/mail/internet/ParameterList.java
+++ b/app/src/main/java/javax/mail/internet/ParameterList.java
@@ -216,12 +216,19 @@ public class ParameterList {
     public ParameterList(String s) throws ParseException {
 	this();
 
+	boolean recover = false;
 	HeaderTokenizer h = new HeaderTokenizer(s, HeaderTokenizer.MIME);
 	for (;;) {
 	    HeaderTokenizer.Token tk = h.next();
 	    int type = tk.getType();
 	    String name, value;
 
+		if (recover) {
+			recover = false;
+			while (tk.getType() != HeaderTokenizer.Token.EOF && (char) tk.getType() != ';')
+				tk = h.next();
+		}
+
 	    if (type == HeaderTokenizer.Token.EOF) // done
 		break;
 
@@ -232,18 +239,32 @@ public class ParameterList {
 		if (tk.getType() == HeaderTokenizer.Token.EOF)
 		    break;
 		// parameter name must be a MIME Atom
-		if (tk.getType() != HeaderTokenizer.Token.ATOM)
-		    throw new ParseException("In parameter list <" + s + ">" +
-					    ", expected parameter name, " +
-					    "got \"" + tk.getValue() + "\"");
+		if (tk.getType() != HeaderTokenizer.Token.ATOM) {
+			StringBuilder sb = new StringBuilder(s);
+			int pos = h.getNextPos() - 1;
+			if (pos < sb.length())
+				sb.insert(pos, "^^^");
+			eu.faircode.email.Log.w("In parameter list <" + sb + ">" +
+					", expected parameter name, " +
+					"got \"" + tk.getValue() + "\"");
+			recover = true;
+			continue;
+		}
 		name = tk.getValue().toLowerCase(Locale.ENGLISH);
 
 		// expect '='
 		tk = h.next();
-		if ((char)tk.getType() != '=')
-		    throw new ParseException("In parameter list <" + s + ">" +
-					    ", expected '=', " +
-					    "got \"" + tk.getValue() + "\"");
+		if ((char)tk.getType() != '=') {
+			StringBuilder sb = new StringBuilder(s);
+			int pos = h.getNextPos() - 1;
+			if (pos < sb.length())
+				sb.insert(pos, "^^^");
+			eu.faircode.email.Log.w("In parameter list <" + sb + ">" +
+					", expected '=', " +
+					"got \"" + tk.getValue() + "\"");
+			recover = true;
+			continue;
+		}
 
 		// expect parameter value
 		if (windowshack &&
@@ -256,10 +277,17 @@ public class ParameterList {
 		type = tk.getType();
 		// parameter value must be a MIME Atom or Quoted String
 		if (type != HeaderTokenizer.Token.ATOM &&
-		    type != HeaderTokenizer.Token.QUOTEDSTRING)
-		    throw new ParseException("In parameter list <" + s + ">" +
-					    ", expected parameter value, " +
-					    "got \"" + tk.getValue() + "\"");
+		    type != HeaderTokenizer.Token.QUOTEDSTRING) {
+			StringBuilder sb = new StringBuilder(s);
+			int pos = h.getNextPos() - 1;
+			if (pos < sb.length())
+				sb.insert(pos, "^^^");
+			eu.faircode.email.Log.w("In parameter list <" + sb + ">" +
+					", expected parameter value, " +
+					"got \"" + tk.getValue() + "\"");
+			recover = true;
+			continue;
+		}
 
 		value = tk.getValue();
 		lastName = name;
@@ -285,9 +313,15 @@ public class ParameterList {
 		    value = lastValue + " " + tk.getValue();
 		    list.put(lastName, value);
                 } else {
-		    throw new ParseException("In parameter list <" + s + ">" +
+			StringBuilder sb = new StringBuilder(s);
+			int pos = h.getNextPos() - 1;
+			if (pos < sb.length())
+				sb.insert(pos, "^^^");
+			eu.faircode.email.Log.w("In parameter list <" + sb + ">" +
 					    ", expected ';', got \"" +
 					    tk.getValue() + "\"");
+			recover = true;
+			continue;
 		}
 	    }
         }