diff --git a/src/encoding/armor.js b/src/encoding/armor.js
index 1d249393..dc69143a 100644
--- a/src/encoding/armor.js
+++ b/src/encoding/armor.js
@@ -243,7 +243,7 @@ function dearmor(input) {
               throw new Error('Misformed armored text');
             }
             // remove trailing whitespace at end of lines
-            line = line.replace(/[\t\r\n ]+$/, '');
+            line = util.removeTrailingSpaces(line.replace(/[\r\n]/g, ''));
             if (!type) {
               if (reSplit.test(line)) {
                 type = getType(line);
@@ -294,7 +294,7 @@ function dearmor(input) {
               let remainder = await reader.readToEnd();
               if (!remainder.length) remainder = '';
               remainder = line + remainder;
-              remainder = remainder.replace(/[\t\r ]+$/mg, '');
+              remainder = util.removeTrailingSpaces(remainder.replace(/\r/g, ''));
               const parts = remainder.split(reSplit);
               if (parts.length === 1) {
                 throw new Error('Misformed armored text');
diff --git a/src/util.js b/src/util.js
index 0a584f5a..bb3db37d 100644
--- a/src/util.js
+++ b/src/util.js
@@ -702,7 +702,11 @@ export default {
    * Remove trailing spaces and tabs from each line
    */
   removeTrailingSpaces: function(text) {
-    return text.replace(/[ \t]+$/mg, "");
+    return text.split('\n').map(line => {
+      let i = line.length - 1;
+      for (; i >= 0 && (line[i] === ' ' || line[i] === '\t'); i--);
+      return line.substr(0, i + 1);
+    }).join('\n');
   },
 
   /**
diff --git a/test/general/openpgp.js b/test/general/openpgp.js
index 0ed9ee9e..f82d0cc8 100644
--- a/test/general/openpgp.js
+++ b/test/general/openpgp.js
@@ -1807,7 +1807,7 @@ describe('[Sauce Labs Group 2] OpenPGP.js public api tests', function() {
           verifyOpt.message = await openpgp.cleartext.readArmored(signed.data);
           return openpgp.verify(verifyOpt);
         }).then(async function (verified) {
-          expect(verified.data).to.equal(openpgp.util.removeTrailingSpaces(plaintext));
+          expect(verified.data).to.equal(plaintext.replace(/[ \t]+$/mg, ''));
           expect(verified.signatures[0].valid).to.be.true;
           const signingKey = await privateKey.keys[0].getSigningKey();
           expect(verified.signatures[0].keyid.toHex()).to.equal(signingKey.getKeyId().toHex());
@@ -1833,7 +1833,7 @@ describe('[Sauce Labs Group 2] OpenPGP.js public api tests', function() {
           return openpgp.verify(verifyOpt);
         }).then(async function (verified) {
           let signingKey;
-          expect(verified.data).to.equal(openpgp.util.removeTrailingSpaces(plaintext));
+          expect(verified.data).to.equal(plaintext.replace(/[ \t]+$/mg, ''));
           expect(verified.signatures[0].valid).to.be.true;
           signingKey = await privateKey.keys[0].getSigningKey();
           expect(verified.signatures[0].keyid.toHex()).to.equal(signingKey.getKeyId().toHex());
@@ -1860,7 +1860,7 @@ describe('[Sauce Labs Group 2] OpenPGP.js public api tests', function() {
           verifyOpt.signature = await openpgp.signature.readArmored(signed.signature);
           return openpgp.verify(verifyOpt);
         }).then(async function (verified) {
-          expect(verified.data).to.equal(openpgp.util.removeTrailingSpaces(plaintext));
+          expect(verified.data).to.equal(plaintext.replace(/[ \t]+$/mg, ''));
           expect(verified.signatures[0].valid).to.be.true;
           const signingKey = await privateKey.keys[0].getSigningKey();
           expect(verified.signatures[0].keyid.toHex()).to.equal(signingKey.getKeyId().toHex());
@@ -1881,7 +1881,7 @@ describe('[Sauce Labs Group 2] OpenPGP.js public api tests', function() {
           verifyOpt.message = await openpgp.cleartext.readArmored(signed.data);
           return openpgp.verify(verifyOpt);
         }).then(async function (verified) {
-          expect(verified.data).to.equal(openpgp.util.removeTrailingSpaces(plaintext));
+          expect(verified.data).to.equal(plaintext.replace(/[ \t]+$/mg, ''));
           expect(verified.signatures[0].valid).to.be.null;
           const signingKey = await privateKey.keys[0].getSigningKey();
           expect(verified.signatures[0].keyid.toHex()).to.equal(signingKey.getKeyId().toHex());
@@ -1904,7 +1904,7 @@ describe('[Sauce Labs Group 2] OpenPGP.js public api tests', function() {
           verifyOpt.signature = await openpgp.signature.readArmored(signed.signature);
           return openpgp.verify(verifyOpt);
         }).then(async function (verified) {
-          expect(verified.data).to.equal(openpgp.util.removeTrailingSpaces(plaintext));
+          expect(verified.data).to.equal(plaintext.replace(/[ \t]+$/mg, ''));
           expect(verified.signatures[0].valid).to.be.null;
           const signingKey = await privateKey.keys[0].getSigningKey();
           expect(verified.signatures[0].keyid.toHex()).to.equal(signingKey.getKeyId().toHex());
@@ -1926,7 +1926,7 @@ describe('[Sauce Labs Group 2] OpenPGP.js public api tests', function() {
           verifyOpt.message = signed.message;
           return openpgp.verify(verifyOpt);
         }).then(async function (verified) {
-          expect(verified.data).to.equal(openpgp.util.removeTrailingSpaces(plaintext));
+          expect(verified.data).to.equal(plaintext.replace(/[ \t]+$/mg, ''));
           expect(verified.signatures[0].valid).to.be.true;
           const signingKey = await privateKey.keys[0].getSigningKey();
           expect(verified.signatures[0].keyid.toHex()).to.equal(signingKey.getKeyId().toHex());
@@ -1951,7 +1951,7 @@ describe('[Sauce Labs Group 2] OpenPGP.js public api tests', function() {
               verifyOpt.signature = signed.signature;
               return openpgp.verify(verifyOpt);
           }).then(async function (verified) {
-              expect(verified.data).to.equal(openpgp.util.removeTrailingSpaces(plaintext));
+              expect(verified.data).to.equal(plaintext.replace(/[ \t]+$/mg, ''));
               expect(+verified.signatures[0].signature.packets[0].created).to.be.lte(+openpgp.util.normalizeDate());
               expect(+verified.signatures[0].signature.packets[0].created).to.be.gte(+start);
               expect(verified.signatures[0].valid).to.be.true;
@@ -1980,7 +1980,7 @@ describe('[Sauce Labs Group 2] OpenPGP.js public api tests', function() {
               verifyOpt.signature = signed.signature;
               return openpgp.verify(verifyOpt).then(async function (verified) {
                 expect(+verified.signatures[0].signature.packets[0].created).to.equal(+past);
-                expect(verified.data).to.equal(openpgp.util.removeTrailingSpaces(plaintext));
+                expect(verified.data).to.equal(plaintext.replace(/[ \t]+$/mg, ''));
                 expect(verified.signatures[0].valid).to.be.true;
                 expect(await signOpt.privateKeys[0].getSigningKey(verified.signatures[0].keyid, past))
                     .to.be.not.null;
@@ -1990,7 +1990,7 @@ describe('[Sauce Labs Group 2] OpenPGP.js public api tests', function() {
                 return openpgp.verify(verifyOpt);
               }).then(async function (verified) {
                 expect(+verified.signatures[0].signature.packets[0].created).to.equal(+past);
-                expect(verified.data).to.equal(openpgp.util.removeTrailingSpaces(plaintext));
+                expect(verified.data).to.equal(plaintext.replace(/[ \t]+$/mg, ''));
                 expect(verified.signatures[0].valid).to.be.true;
                 expect(await signOpt.privateKeys[0].getSigningKey(verified.signatures[0].keyid, null))
                     .to.be.not.null;
diff --git a/test/general/signature.js b/test/general/signature.js
index ffac14a8..14e67a8c 100644
--- a/test/general/signature.js
+++ b/test/general/signature.js
@@ -525,7 +525,7 @@ zmuVOdNuWQqxT9Sqa84=
 
     return openpgp.verify({ publicKeys:[pubKey], message:csMsg }).then(function(cleartextSig) {
       expect(cleartextSig).to.exist;
-      expect(cleartextSig.data).to.equal(openpgp.util.removeTrailingSpaces(plaintext));
+      expect(cleartextSig.data).to.equal(plaintext.replace(/[ \t]+$/mg, ''));
       expect(cleartextSig.signatures).to.have.length(1);
       expect(cleartextSig.signatures[0].valid).to.be.true;
       expect(cleartextSig.signatures[0].signature.packets.length).to.equal(1);
@@ -648,7 +648,7 @@ hkJiXopCSWKSlQInL1devkJJUWJmTmZeugJYlpdLAagQJM0JpsCqIQZwKgAA
 
     }).then(function(cleartextSig) {
       expect(cleartextSig).to.exist;
-      expect(cleartextSig.data).to.equal(openpgp.util.removeTrailingSpaces(plaintext.replace(/\r/g,'')));
+      expect(cleartextSig.data).to.equal(plaintext.replace(/[ \t\r]+$/mg, ''));
       expect(cleartextSig.signatures).to.have.length(1);
       expect(cleartextSig.signatures[0].valid).to.be.true;
       expect(cleartextSig.signatures[0].signature.packets.length).to.equal(1);
@@ -688,7 +688,7 @@ hkJiXopCSWKSlQInL1devkJJUWJmTmZeugJYlpdLAagQJM0JpsCqIQZwKgAA
 
     }).then(function(cleartextSig) {
       expect(cleartextSig).to.exist;
-      expect(cleartextSig.data).to.equal(openpgp.util.removeTrailingSpaces(plaintext));
+      expect(cleartextSig.data).to.equal(plaintext.replace(/[ \t]+$/mg, ''));
       expect(cleartextSig.signatures).to.have.length(1);
       expect(cleartextSig.signatures[0].valid).to.be.true;
       expect(cleartextSig.signatures[0].signature.packets.length).to.equal(1);
diff --git a/test/general/x25519.js b/test/general/x25519.js
index a938ded1..0acc602c 100644
--- a/test/general/x25519.js
+++ b/test/general/x25519.js
@@ -180,7 +180,7 @@ describe('X25519 Cryptography', function () {
     const result = await openpgp.verify({ publicKeys: [pub], message: msg});
 
     expect(result).to.exist;
-    expect(result.data).to.equal(openpgp.util.removeTrailingSpaces(randomData));
+    expect(result.data).to.equal(randomData.replace(/[ \t]+$/mg, ''));
     expect(result.signatures).to.have.length(1);
     expect(result.signatures[0].valid).to.be.true;
   });