1 files changed, 16 insertions, 2 deletions

diff --git a/src/mailman_pgp/pgp/wrapper.py b/src/mailman_pgp/pgp/wrapper.py
index 9a004c4..c6d8dff 100644
--- a/src/mailman_pgp/pgp/wrapper.py
+++ b/src/mailman_pgp/pgp/wrapper.py
@@ -57,7 +57,7 @@ class PGPWrapper():
         """
         if self.is_mime_signed():
             return self.mime.verify(key)
-        else:
+        elif self.is_inline_signed():
             return self.inline.verify(key)
 
     def is_mime_encrypted(self):
@@ -80,5 +80,19 @@ class PGPWrapper():
         """
         if self.is_mime_encrypted():
             return self.mime.decrypt(key)
-        else:
+        elif self.is_inline_encrypted():
             return self.inline.decrypt(key)
+
+    def has_keys(self):
+        return self.mime.has_keys() or self.inline.has_keys()
+
+    def keys(self):
+        """
+        Get the collection of keys in this message.
+
+        :return: A collection of keys.
+        """
+        if self.mime.has_keys():
+            yield from self.mime.keys()
+        elif self.inline.has_keys():
+            yield from self.inline.keys()