diff --git a/resources/openpgp.js b/resources/openpgp.js
index 25736fd6..a63a18d5 100644
--- a/resources/openpgp.js
+++ b/resources/openpgp.js
@@ -7512,29 +7512,66 @@ function r2s(t) {
  * DeArmor an OpenPGP armored message; verify the checksum and return 
  * the encoded bytes
  * @param {String} text OpenPGP armored message
- * @returns {(String|Object)} Either the bytes of the decoded message 
+ * @returns {(Boolean|Object)} Either false in case of an error 
  * or an object with attribute "text" containing the message text
  * and an attribute "openpgp" containing the bytes.
  */
 function openpgp_encoding_deArmor(text) {
-	var type = getPGPMessageType(text);
+	text = text.replace(/\r/g, '')
+
+	var type = openpgp_encoding_get_type(text);
+
 	if (type != 2) {
-	var splittedtext = text.split('-----');
-	data = { openpgp: openpgp_encoding_base64_decode(splittedtext[2].split('\n\n')[1].split("\n=")[0].replace(/\n- /g,"\n")),
-			type: type};
-	if (verifyCheckSum(data.openpgp, splittedtext[2].split('\n\n')[1].split("\n=")[1].split('\n')[0]))
-		return data;
-	else
-		util.print_error("Ascii armor integrity check on message failed: '"+splittedtext[2].split('\n\n')[1].split("\n=")[1].split('\n')[0]+"' should be '"+getCheckSum(data))+"'";
+		var splittedtext = text.split('-----');
+
+		var data = { 
+			openpgp: openpgp_encoding_base64_decode(
+				splittedtext[2]
+					.split('\n\n')[1]
+					.split("\n=")[0]
+					.replace(/\n- /g,"\n")),
+			type: type
+		};
+
+		if (verifyCheckSum(data.openpgp, 
+			splittedtext[2]
+				.split('\n\n')[1]
+				.split("\n=")[1]
+				.split('\n')[0]))
+
+			return data;
+		else {
+			util.print_error("Ascii armor integrity check on message failed: '"
+				+ splittedtext[2]
+					.split('\n\n')[1]
+					.split("\n=")[1]
+					.split('\n')[0] 
+				+ "' should be '"
+				+ getCheckSum(data)) + "'";
+			return false;
+		}
 	} else {
 		var splittedtext = text.split('-----');
-		var result = { text: splittedtext[2].replace(/\n- /g,"\n").split("\n\n")[1],
-		               openpgp: openpgp_encoding_base64_decode(splittedtext[4].split("\n\n")[1].split("\n=")[0]),
-		               type: type};
-		if (verifyCheckSum(result.openpgp, splittedtext[4].split("\n\n")[1].split("\n=")[1]))
+
+		var result = {
+			text: splittedtext[2]
+				.replace(/\n- /g,"\n")
+				.split("\n\n")[1],
+			openpgp: openpgp_encoding_base64_decode(splittedtext[4]
+				.split("\n\n")[1]
+				.split("\n=")[0]),
+			type: type
+		};
+
+		if (verifyCheckSum(result.openpgp, splittedtext[4]
+			.split("\n\n")[1]
+			.split("\n=")[1]))
+
 				return result;
-		else
+		else {
 			util.print_error("Ascii armor integrity check on message failed");
+			return false;
+		}
 	}
 }
 
@@ -7549,7 +7586,7 @@ function openpgp_encoding_deArmor(text) {
  *         5 = PRIVATE KEY BLOCK
  *         null = unknown
  */
-function getPGPMessageType(text) {
+function openpgp_encoding_get_type(text) {
 	var splittedtext = text.split('-----');
 	// BEGIN PGP MESSAGE, PART X/Y
 	// Used for multi-part messages, where the armor is split amongst Y
diff --git a/resources/openpgp.min.js b/resources/openpgp.min.js
index 0f1cf459..62f71a71 100644
--- a/resources/openpgp.min.js
+++ b/resources/openpgp.min.js
@@ -288,9 +288,9 @@ JXG.Util.genUUID=function(){for(var b="0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcde
 function openpgp_config(){this.config=null;this.default_config={prefer_hash_algorithm:2,encryption_cipher:9,compression:1,show_version:!0,show_comment:!0,integrity_protect:!0,composition_behavior:0,keyserver:"keyserver.linux.it"};this.versionstring="OpenPGP.js v.1.20130416";this.commentstring="http://openpgpjs.org";this.debug=!1;this.read=function(){var b=JSON.parse(window.localStorage.getItem("config"));null==b?(this.config=this.default_config,this.write()):this.config=b};this.write=function(){window.localStorage.setItem("config",
 JSON.stringify(this.config))}}var b64s="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";function s2r(b){var a,c,d,e="",f=0,g=0,h=b.length;for(d=0;d<h;d++)c=b.charCodeAt(d),0==g?(e+=b64s.charAt(c>>2&63),a=(c&3)<<4):1==g?(e+=b64s.charAt(a|c>>4&15),a=(c&15)<<2):2==g&&(e+=b64s.charAt(a|c>>6&3),f+=1,0==f%60&&(e+="\n"),e+=b64s.charAt(c&63)),f+=1,0==f%60&&(e+="\n"),g+=1,3==g&&(g=0);0<g&&(e+=b64s.charAt(a),f+=1,0==f%60&&(e+="\n"),e+="=",f+=1);1==g&&(0==f%60&&(e+="\n"),e+="=");return e}
 function r2s(b){var a,c,d="",e=0,f=0,g=b.length;for(c=0;c<g;c++)a=b64s.indexOf(b.charAt(c)),0<=a&&(e&&(d+=String.fromCharCode(f|a>>6-e&255)),e=e+2&7,f=a<<e&255);return d}
-function openpgp_encoding_deArmor(b){var a=getPGPMessageType(b);if(2!=a){b=b.split("-----");data={openpgp:openpgp_encoding_base64_decode(b[2].split("\n\n")[1].split("\n=")[0].replace(/\n- /g,"\n")),type:a};if(verifyCheckSum(data.openpgp,b[2].split("\n\n")[1].split("\n=")[1].split("\n")[0]))return data;util.print_error("Ascii armor integrity check on message failed: '"+b[2].split("\n\n")[1].split("\n=")[1].split("\n")[0]+"' should be '"+getCheckSum(data))}else{b=b.split("-----");a={text:b[2].replace(/\n- /g,
-"\n").split("\n\n")[1],openpgp:openpgp_encoding_base64_decode(b[4].split("\n\n")[1].split("\n=")[0]),type:a};if(verifyCheckSum(a.openpgp,b[4].split("\n\n")[1].split("\n=")[1]))return a;util.print_error("Ascii armor integrity check on message failed")}}
-function getPGPMessageType(b){b=b.split("-----");if(b[1].match(/BEGIN PGP MESSAGE, PART \d+\/\d+/))return 0;if(b[1].match(/BEGIN PGP MESSAGE, PART \d+/))return 1;if(b[1].match(/BEGIN PGP SIGNED MESSAGE/))return 2;if(b[1].match(/BEGIN PGP MESSAGE/))return 3;if(b[1].match(/BEGIN PGP PUBLIC KEY BLOCK/))return 4;if(b[1].match(/BEGIN PGP PRIVATE KEY BLOCK/))return 5}
+function openpgp_encoding_deArmor(b){var b=b.replace(/\r/g,""),a=openpgp_encoding_get_type(b);if(2!=a){b=b.split("-----");a={openpgp:openpgp_encoding_base64_decode(b[2].split("\n\n")[1].split("\n=")[0].replace(/\n- /g,"\n")),type:a};if(verifyCheckSum(a.openpgp,b[2].split("\n\n")[1].split("\n=")[1].split("\n")[0]))return a;util.print_error("Ascii armor integrity check on message failed: '"+b[2].split("\n\n")[1].split("\n=")[1].split("\n")[0]+"' should be '"+getCheckSum(a));return!1}b=b.split("-----");
+a={text:b[2].replace(/\n- /g,"\n").split("\n\n")[1],openpgp:openpgp_encoding_base64_decode(b[4].split("\n\n")[1].split("\n=")[0]),type:a};if(verifyCheckSum(a.openpgp,b[4].split("\n\n")[1].split("\n=")[1]))return a;util.print_error("Ascii armor integrity check on message failed");return!1}
+function openpgp_encoding_get_type(b){b=b.split("-----");if(b[1].match(/BEGIN PGP MESSAGE, PART \d+\/\d+/))return 0;if(b[1].match(/BEGIN PGP MESSAGE, PART \d+/))return 1;if(b[1].match(/BEGIN PGP SIGNED MESSAGE/))return 2;if(b[1].match(/BEGIN PGP MESSAGE/))return 3;if(b[1].match(/BEGIN PGP PUBLIC KEY BLOCK/))return 4;if(b[1].match(/BEGIN PGP PRIVATE KEY BLOCK/))return 5}
 function openpgp_encoding_armor_addheader(){var b="";openpgp.config.config.show_version&&(b+="Version: "+openpgp.config.versionstring+"\r\n");openpgp.config.config.show_comment&&(b+="Comment: "+openpgp.config.commentstring+"\r\n");return b+"\r\n"}
 function openpgp_encoding_armor(b,a,c,d){var e="";switch(b){case 0:e=e+("-----BEGIN PGP MESSAGE, PART "+c+"/"+d+"-----\r\n")+openpgp_encoding_armor_addheader();e+=openpgp_encoding_base64_encode(a);e+="\r\n="+getCheckSum(a)+"\r\n";e+="-----END PGP MESSAGE, PART "+c+"/"+d+"-----\r\n";break;case 1:e=e+("-----BEGIN PGP MESSAGE, PART "+c+"-----\r\n")+openpgp_encoding_armor_addheader();e+=openpgp_encoding_base64_encode(a);e+="\r\n="+getCheckSum(a)+"\r\n";e+="-----END PGP MESSAGE, PART "+c+"-----\r\n";break;
 case 2:e+="\r\n-----BEGIN PGP SIGNED MESSAGE-----\r\nHash: "+a.hash+"\r\n\r\n";e+=a.text.replace(/\n-/g,"\n- -");e=e+"\r\n-----BEGIN PGP SIGNATURE-----\r\n"+openpgp_encoding_armor_addheader();e+=openpgp_encoding_base64_encode(a.openpgp);e+="\r\n="+getCheckSum(a.openpgp)+"\r\n";e+="-----END PGP SIGNATURE-----\r\n";break;case 3:e=e+"-----BEGIN PGP MESSAGE-----\r\n"+openpgp_encoding_armor_addheader();e+=openpgp_encoding_base64_encode(a);e+="\r\n="+getCheckSum(a)+"\r\n";e+="-----END PGP MESSAGE-----\r\n";
diff --git a/src/encoding/openpgp.encoding.asciiarmor.js b/src/encoding/openpgp.encoding.asciiarmor.js
index 40460ba2..84aca0a5 100644
--- a/src/encoding/openpgp.encoding.asciiarmor.js
+++ b/src/encoding/openpgp.encoding.asciiarmor.js
@@ -19,29 +19,66 @@
  * DeArmor an OpenPGP armored message; verify the checksum and return 
  * the encoded bytes
  * @param {String} text OpenPGP armored message
- * @returns {(String|Object)} Either the bytes of the decoded message 
+ * @returns {(Boolean|Object)} Either false in case of an error 
  * or an object with attribute "text" containing the message text
  * and an attribute "openpgp" containing the bytes.
  */
 function openpgp_encoding_deArmor(text) {
-	var type = getPGPMessageType(text);
+	text = text.replace(/\r/g, '')
+
+	var type = openpgp_encoding_get_type(text);
+
 	if (type != 2) {
-	var splittedtext = text.split('-----');
-	data = { openpgp: openpgp_encoding_base64_decode(splittedtext[2].split('\n\n')[1].split("\n=")[0].replace(/\n- /g,"\n")),
-			type: type};
-	if (verifyCheckSum(data.openpgp, splittedtext[2].split('\n\n')[1].split("\n=")[1].split('\n')[0]))
-		return data;
-	else
-		util.print_error("Ascii armor integrity check on message failed: '"+splittedtext[2].split('\n\n')[1].split("\n=")[1].split('\n')[0]+"' should be '"+getCheckSum(data))+"'";
+		var splittedtext = text.split('-----');
+
+		var data = { 
+			openpgp: openpgp_encoding_base64_decode(
+				splittedtext[2]
+					.split('\n\n')[1]
+					.split("\n=")[0]
+					.replace(/\n- /g,"\n")),
+			type: type
+		};
+
+		if (verifyCheckSum(data.openpgp, 
+			splittedtext[2]
+				.split('\n\n')[1]
+				.split("\n=")[1]
+				.split('\n')[0]))
+
+			return data;
+		else {
+			util.print_error("Ascii armor integrity check on message failed: '"
+				+ splittedtext[2]
+					.split('\n\n')[1]
+					.split("\n=")[1]
+					.split('\n')[0] 
+				+ "' should be '"
+				+ getCheckSum(data)) + "'";
+			return false;
+		}
 	} else {
 		var splittedtext = text.split('-----');
-		var result = { text: splittedtext[2].replace(/\n- /g,"\n").split("\n\n")[1],
-		               openpgp: openpgp_encoding_base64_decode(splittedtext[4].split("\n\n")[1].split("\n=")[0]),
-		               type: type};
-		if (verifyCheckSum(result.openpgp, splittedtext[4].split("\n\n")[1].split("\n=")[1]))
+
+		var result = {
+			text: splittedtext[2]
+				.replace(/\n- /g,"\n")
+				.split("\n\n")[1],
+			openpgp: openpgp_encoding_base64_decode(splittedtext[4]
+				.split("\n\n")[1]
+				.split("\n=")[0]),
+			type: type
+		};
+
+		if (verifyCheckSum(result.openpgp, splittedtext[4]
+			.split("\n\n")[1]
+			.split("\n=")[1]))
+
 				return result;
-		else
+		else {
 			util.print_error("Ascii armor integrity check on message failed");
+			return false;
+		}
 	}
 }
 
@@ -56,7 +93,7 @@ function openpgp_encoding_deArmor(text) {
  *         5 = PRIVATE KEY BLOCK
  *         null = unknown
  */
-function getPGPMessageType(text) {
+function openpgp_encoding_get_type(text) {
 	var splittedtext = text.split('-----');
 	// BEGIN PGP MESSAGE, PART X/Y
 	// Used for multi-part messages, where the armor is split amongst Y