diff --git a/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/pgp/SplitUserIdTest.java b/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/pgp/SplitUserIdTest.java
index 8f8ca1337..335be9825 100644
--- a/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/pgp/SplitUserIdTest.java
+++ b/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/pgp/SplitUserIdTest.java
@@ -130,4 +130,12 @@ public class SplitUserIdTest {
         Assert.assertEquals("this is a comment", info.comment);
     }
 
-}
\ No newline at end of file
+    @Test
+    public void splitUserIdWithEmailWithoutTldShouldReturnNameAndEmail() {
+        OpenPgpUtils.UserId info = KeyRing.splitUserId("Max Mustermann <max@localhost>");
+        Assert.assertEquals("Max Mustermann", info.name);
+        Assert.assertEquals("max@localhost", info.email);
+        Assert.assertNull(info.comment);
+    }
+
+}
diff --git a/extern/openpgp-api-lib b/extern/openpgp-api-lib
index 89dd28164..8bc98b412 160000
--- a/extern/openpgp-api-lib
+++ b/extern/openpgp-api-lib
@@ -1 +1 @@
-Subproject commit 89dd28164af4ad48069977e53deaca49b7d0e291
+Subproject commit 8bc98b412bd7cd546b33eac1ced1c1cb302906ca