more openpgp bug fixes

libs/openpgp-api-lib

@@ -1 +1 @@
-Subproject commit 650e1ebda82596cd4fbfaae406e6eccf189f4f63
+Subproject commit 6bec5eedde31bacbafcb541a728719eeff99d3b7

src/eu/siacs/conversations/crypto/PgpEngine.java

@@ -171,9 +171,11 @@ public class PgpEngine {
 							os.flush();
 							StringBuilder encryptedMessageBody = new StringBuilder();
 							String[] lines = os.toString().split("\n");
-							for (int i = 3; i < lines.length - 1; ++i) {
+							for (int i = 2; i < lines.length - 1; ++i) {
+								if (!lines[i].contains("Version")) {
 									encryptedMessageBody.append(lines[i].trim());
 								}
+							}
 							message.setEncryptedBody(encryptedMessageBody
 									.toString());
 							callback.success(message);
@@ -304,9 +306,11 @@ public class PgpEngine {
 								if (line.contains("END PGP SIGNATURE")) {
 									sig = false;
 								} else {
+									if (!line.contains("Version")) {
 										signatureBuilder.append(line.trim());
 									}
 								}
+							}
 							if (line.contains("BEGIN PGP SIGNATURE")) {
 								sig = true;
 							}