diff --git a/smack-openpgp-bouncycastle/src/main/java/org/jivesoftware/smackx/ox/bouncycastle/BouncyCastleIdentityStore.java b/smack-openpgp-bouncycastle/src/main/java/org/jivesoftware/smackx/ox/bouncycastle/BouncyCastleIdentityStore.java
index 0218ebdfc..a575e5649 100644
--- a/smack-openpgp-bouncycastle/src/main/java/org/jivesoftware/smackx/ox/bouncycastle/BouncyCastleIdentityStore.java
+++ b/smack-openpgp-bouncycastle/src/main/java/org/jivesoftware/smackx/ox/bouncycastle/BouncyCastleIdentityStore.java
@@ -1,3 +1,19 @@
+/**
+ *
+ * Copyright 2018 Paul Schaub.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jivesoftware.smackx.ox.bouncycastle;
 
 import java.io.FileNotFoundException;
diff --git a/smack-openpgp-bouncycastle/src/main/java/org/jivesoftware/smackx/ox/bouncycastle/BouncycastleOpenPgpProvider.java b/smack-openpgp-bouncycastle/src/main/java/org/jivesoftware/smackx/ox/bouncycastle/BouncyCastleOpenPgpProvider.java
similarity index 92%
rename from smack-openpgp-bouncycastle/src/main/java/org/jivesoftware/smackx/ox/bouncycastle/BouncycastleOpenPgpProvider.java
rename to smack-openpgp-bouncycastle/src/main/java/org/jivesoftware/smackx/ox/bouncycastle/BouncyCastleOpenPgpProvider.java
index e21ccad00..32fc44683 100644
--- a/smack-openpgp-bouncycastle/src/main/java/org/jivesoftware/smackx/ox/bouncycastle/BouncycastleOpenPgpProvider.java
+++ b/smack-openpgp-bouncycastle/src/main/java/org/jivesoftware/smackx/ox/bouncycastle/BouncyCastleOpenPgpProvider.java
@@ -33,6 +33,7 @@ import org.jivesoftware.smackx.ox.OpenPgpMessage;
 import org.jivesoftware.smackx.ox.OpenPgpProvider;
 import org.jivesoftware.smackx.ox.element.OpenPgpElement;
 import org.jivesoftware.smackx.ox.element.PubkeyElement;
+import org.jivesoftware.smackx.ox.element.PublicKeysListElement;
 
 import name.neuhalfen.projects.crypto.bouncycastle.openpgp.BouncyGPG;
 import name.neuhalfen.projects.crypto.bouncycastle.openpgp.algorithms.PublicKeySize;
@@ -50,14 +51,14 @@ import org.bouncycastle.util.encoders.Hex;
 import org.bouncycastle.util.io.Streams;
 import org.jxmpp.jid.BareJid;
 
-public class BouncycastleOpenPgpProvider implements OpenPgpProvider {
+public class BouncyCastleOpenPgpProvider implements OpenPgpProvider {
 
     private final BareJid ourJid;
     private final InMemoryKeyring ourKeys;
     private final Long ourKeyId;
     private final Map<BareJid, InMemoryKeyring> theirKeys = new HashMap<>();
 
-    public BouncycastleOpenPgpProvider(BareJid ourJid) throws IOException, PGPException, NoSuchAlgorithmException {
+    public BouncyCastleOpenPgpProvider(BareJid ourJid) throws IOException, PGPException, NoSuchAlgorithmException {
         this.ourJid = ourJid;
         PGPSecretKeyRing ourKey = generateKey(ourJid).generateSecretKeyRing();
         ourKeyId = ourKey.getPublicKey().getKeyID();
@@ -87,6 +88,11 @@ public class BouncycastleOpenPgpProvider implements OpenPgpProvider {
         contactsKeyring.addPublicKey(decoded);
     }
 
+    @Override
+    public void processPublicKeysListElement(PublicKeysListElement listElement, BareJid from) throws Exception {
+
+    }
+
     @Override
     public OpenPgpElement signAndEncrypt(InputStream inputStream, Set<BareJid> recipients)
             throws Exception {
@@ -138,6 +144,16 @@ public class BouncycastleOpenPgpProvider implements OpenPgpProvider {
         return new OpenPgpElement(base64);
     }
 
+    @Override
+    public OpenPgpElement sign(InputStream inputStream) throws Exception {
+        return null;
+    }
+
+    @Override
+    public OpenPgpElement encrypt(InputStream inputStream, Set<BareJid> recipients) throws Exception {
+        return null;
+    }
+
     @Override
     public OpenPgpMessage decryptAndVerify(OpenPgpElement element, BareJid sender) throws Exception {
         InMemoryKeyring decryptionConfig = KeyringConfigs.forGpgExportedKeys(KeyringConfigCallbacks.withUnprotectedKeys());
@@ -168,7 +184,7 @@ public class BouncycastleOpenPgpProvider implements OpenPgpProvider {
 
         Streams.pipeAll(decrypted, decryptedOut);
 
-        return new OpenPgpMessage(null, new String(decryptedOut.toByteArray(), Charset.forName("UTF-8")));
+        return new OpenPgpMessage(new String(decryptedOut.toByteArray(), Charset.forName("UTF-8")));
     }
 
     @Override
diff --git a/smack-openpgp-bouncycastle/src/main/java/org/jivesoftware/smackx/ox/bouncycastle/FileBasedBouncyCastleIdentityStore.java b/smack-openpgp-bouncycastle/src/main/java/org/jivesoftware/smackx/ox/bouncycastle/FileBasedBouncyCastleIdentityStore.java
index b9aec55e0..1aaa36844 100644
--- a/smack-openpgp-bouncycastle/src/main/java/org/jivesoftware/smackx/ox/bouncycastle/FileBasedBouncyCastleIdentityStore.java
+++ b/smack-openpgp-bouncycastle/src/main/java/org/jivesoftware/smackx/ox/bouncycastle/FileBasedBouncyCastleIdentityStore.java
@@ -1,3 +1,19 @@
+/**
+ *
+ * Copyright 2018 Paul Schaub.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jivesoftware.smackx.ox.bouncycastle;
 
 import java.io.DataInputStream;
@@ -56,6 +72,10 @@ public class FileBasedBouncyCastleIdentityStore implements BouncyCastleIdentityS
     public PublicKeysListElement loadPubkeyList(BareJid jid) throws IOException {
         File contactsDir = contactsDir(jid);
         File source = new File(contactsDir, "pubkey_list");
+        if (!source.exists()) {
+            LOGGER.log(Level.FINE, "File " + source.getAbsolutePath() + " does not exist. Returning null.");
+            return null;
+        }
         DataInputStream dataIn = new DataInputStream(new FileInputStream(source));
 
         PublicKeysListElement.Builder builder = PublicKeysListElement.builder();
diff --git a/smack-openpgp-bouncycastle/src/test/java/org/jivesoftware/smackx/ox/bouncycastle/BasicEncryptionTest.java b/smack-openpgp-bouncycastle/src/test/java/org/jivesoftware/smackx/ox/bouncycastle/BasicEncryptionTest.java
index 5fc6c35b4..65c0d197b 100644
--- a/smack-openpgp-bouncycastle/src/test/java/org/jivesoftware/smackx/ox/bouncycastle/BasicEncryptionTest.java
+++ b/smack-openpgp-bouncycastle/src/test/java/org/jivesoftware/smackx/ox/bouncycastle/BasicEncryptionTest.java
@@ -116,8 +116,8 @@ public class BasicEncryptionTest extends SmackTestSuite {
             throws IOException, PGPException, NoSuchAlgorithmException, NoSuchProviderException, SignatureException {
         final String alice = "alice@wonderland.lit";
         final String bob = "bob@builder.tv";
-        PGPKeyRingGenerator g1 = BouncycastleOpenPgpProvider.generateKey(JidCreate.bareFrom(alice));
-        PGPKeyRingGenerator g2 = BouncycastleOpenPgpProvider.generateKey(JidCreate.bareFrom(bob));
+        PGPKeyRingGenerator g1 = BouncyCastleOpenPgpProvider.generateKey(JidCreate.bareFrom(alice));
+        PGPKeyRingGenerator g2 = BouncyCastleOpenPgpProvider.generateKey(JidCreate.bareFrom(bob));
         PGPSecretKey s1 = g1.generateSecretKeyRing().getSecretKey();
         PGPSecretKey s2 = g2.generateSecretKeyRing().getSecretKey();
         PGPPublicKey p1 = g1.generatePublicKeyRing().getPublicKey();
diff --git a/smack-openpgp-bouncycastle/src/test/java/org/jivesoftware/smackx/ox/bouncycastle/BouncycastleOpenPgpProviderTest.java b/smack-openpgp-bouncycastle/src/test/java/org/jivesoftware/smackx/ox/bouncycastle/BouncyCastleOpenPgpProviderTest.java
similarity index 93%
rename from smack-openpgp-bouncycastle/src/test/java/org/jivesoftware/smackx/ox/bouncycastle/BouncycastleOpenPgpProviderTest.java
rename to smack-openpgp-bouncycastle/src/test/java/org/jivesoftware/smackx/ox/bouncycastle/BouncyCastleOpenPgpProviderTest.java
index b6d063152..db36d8478 100644
--- a/smack-openpgp-bouncycastle/src/test/java/org/jivesoftware/smackx/ox/bouncycastle/BouncycastleOpenPgpProviderTest.java
+++ b/smack-openpgp-bouncycastle/src/test/java/org/jivesoftware/smackx/ox/bouncycastle/BouncyCastleOpenPgpProviderTest.java
@@ -37,7 +37,7 @@ import org.jxmpp.jid.BareJid;
 import org.jxmpp.jid.Jid;
 import org.jxmpp.jid.impl.JidCreate;
 
-public class BouncycastleOpenPgpProviderTest extends SmackTestSuite {
+public class BouncyCastleOpenPgpProviderTest extends SmackTestSuite {
 
     @Test
     public void encryptAndSign_decryptAndVerifyElementTest() throws Exception {
@@ -46,8 +46,8 @@ public class BouncycastleOpenPgpProviderTest extends SmackTestSuite {
         // Create providers for alice and the cat
         BareJid alice = JidCreate.bareFrom("alice@wonderland.lit");
         BareJid cheshire = JidCreate.bareFrom("cheshire@wonderland.lit");
-        BouncycastleOpenPgpProvider aliceProvider = new BouncycastleOpenPgpProvider(alice);
-        BouncycastleOpenPgpProvider cheshireProvider = new BouncycastleOpenPgpProvider(cheshire);
+        BouncyCastleOpenPgpProvider aliceProvider = new BouncyCastleOpenPgpProvider(alice);
+        BouncyCastleOpenPgpProvider cheshireProvider = new BouncyCastleOpenPgpProvider(cheshire);
 
         // dry exchange keys
         PubkeyElement aliceKeys = aliceProvider.createPubkeyElement();
diff --git a/smack-openpgp-bouncycastle/src/test/java/org/jivesoftware/smackx/ox/bouncycastle/FileBasedBouncyCastleIdentityStoreTest.java b/smack-openpgp-bouncycastle/src/test/java/org/jivesoftware/smackx/ox/bouncycastle/FileBasedBouncyCastleIdentityStoreTest.java
index 5d2c9bd5b..c421f7687 100644
--- a/smack-openpgp-bouncycastle/src/test/java/org/jivesoftware/smackx/ox/bouncycastle/FileBasedBouncyCastleIdentityStoreTest.java
+++ b/smack-openpgp-bouncycastle/src/test/java/org/jivesoftware/smackx/ox/bouncycastle/FileBasedBouncyCastleIdentityStoreTest.java
@@ -1,14 +1,31 @@
+/**
+ *
+ * Copyright 2018 Paul Schaub.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jivesoftware.smackx.ox.bouncycastle;
 
 import static junit.framework.TestCase.assertEquals;
+import static junit.framework.TestCase.assertNull;
 
 import java.io.File;
 import java.io.IOException;
 import java.text.ParseException;
 import java.util.Date;
-import java.util.Stack;
 
 import org.jivesoftware.smack.test.util.SmackTestSuite;
+import org.jivesoftware.smack.util.FileUtils;
 import org.jivesoftware.smackx.ox.element.PublicKeysListElement;
 
 import org.junit.After;
@@ -34,36 +51,6 @@ public class FileBasedBouncyCastleIdentityStoreTest extends SmackTestSuite {
         }
     }
 
-    @Before
-    public void before() {
-        deleteStore();
-    }
-
-    @After
-    public void after() {
-        deleteStore();
-    }
-
-    public void deleteStore() {
-        File[] currList;
-        Stack<File> stack = new Stack<>();
-        stack.push(storePath);
-        while (!stack.isEmpty()) {
-            if (stack.lastElement().isDirectory()) {
-                currList = stack.lastElement().listFiles();
-                if (currList != null && currList.length > 0) {
-                    for (File curr : currList) {
-                        stack.push(curr);
-                    }
-                } else {
-                    stack.pop().delete();
-                }
-            } else {
-                stack.pop().delete();
-            }
-        }
-    }
-
     @Test
     public void writeReadPublicKeysLists() throws ParseException, IOException {
         BareJid jid = JidCreate.bareFrom("edward@snowden.org");
@@ -78,9 +65,26 @@ public class FileBasedBouncyCastleIdentityStoreTest extends SmackTestSuite {
                 .build();
 
         FileBasedBouncyCastleIdentityStore store = new FileBasedBouncyCastleIdentityStore(storePath);
+
+        PublicKeysListElement shouldBeNull = store.loadPubkeyList(jid);
+        assertNull(shouldBeNull);
         store.storePubkeyList(jid, list);
 
         PublicKeysListElement retrieved = store.loadPubkeyList(jid);
         assertEquals(list.getMetadata(), retrieved.getMetadata());
     }
+
+    @Before
+    public void before() {
+        deleteStore();
+    }
+
+    @After
+    public void after() {
+        deleteStore();
+    }
+
+    public void deleteStore() {
+        FileUtils.deleteDirectory(storePath);
+    }
 }
diff --git a/smack-openpgp-bouncycastle/src/test/java/org/jivesoftware/smackx/ox/bouncycastle/KeyGenerationTest.java b/smack-openpgp-bouncycastle/src/test/java/org/jivesoftware/smackx/ox/bouncycastle/KeyGenerationTest.java
index c37d3ef71..8533049c0 100644
--- a/smack-openpgp-bouncycastle/src/test/java/org/jivesoftware/smackx/ox/bouncycastle/KeyGenerationTest.java
+++ b/smack-openpgp-bouncycastle/src/test/java/org/jivesoftware/smackx/ox/bouncycastle/KeyGenerationTest.java
@@ -28,7 +28,7 @@ public class KeyGenerationTest {
 
     @Test
     public void createSecretKey() throws Exception {
-        PGPSecretKey secretKey = BouncycastleOpenPgpProvider
+        PGPSecretKey secretKey = BouncyCastleOpenPgpProvider
                 .generateKey(JidCreate.bareFrom("alice@wonderland.lit"))
                 .generateSecretKeyRing()
                 .getSecretKey();
diff --git a/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/CorruptedOpenPgpKeyException.java b/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/CorruptedOpenPgpKeyException.java
new file mode 100644
index 000000000..b383f3572
--- /dev/null
+++ b/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/CorruptedOpenPgpKeyException.java
@@ -0,0 +1,26 @@
+/**
+ *
+ * Copyright 2018 Paul Schaub.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jivesoftware.smackx.ox;
+
+public class CorruptedOpenPgpKeyException extends Exception {
+
+    private static final long serialVersionUID = 1L;
+
+    public CorruptedOpenPgpKeyException() {
+        super();
+    }
+}
diff --git a/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/OpenPgpManager.java b/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/OpenPgpManager.java
index 0c3b23ac1..74ea57acc 100644
--- a/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/OpenPgpManager.java
+++ b/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/OpenPgpManager.java
@@ -20,12 +20,15 @@ import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.WeakHashMap;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 import org.jivesoftware.smack.Manager;
 import org.jivesoftware.smack.SmackException;
 import org.jivesoftware.smack.XMPPConnection;
 import org.jivesoftware.smack.XMPPException;
 import org.jivesoftware.smack.packet.Message;
+import org.jivesoftware.smack.util.Async;
 import org.jivesoftware.smackx.disco.ServiceDiscoveryManager;
 import org.jivesoftware.smackx.ox.element.PubkeyElement;
 import org.jivesoftware.smackx.ox.element.PublicKeysListElement;
@@ -33,6 +36,7 @@ import org.jivesoftware.smackx.pep.PEPListener;
 import org.jivesoftware.smackx.pep.PEPManager;
 import org.jivesoftware.smackx.pubsub.EventElement;
 import org.jivesoftware.smackx.pubsub.Item;
+import org.jivesoftware.smackx.pubsub.ItemsExtension;
 import org.jivesoftware.smackx.pubsub.LeafNode;
 import org.jivesoftware.smackx.pubsub.PayloadItem;
 import org.jivesoftware.smackx.pubsub.PubSubException;
@@ -41,7 +45,9 @@ import org.jivesoftware.smackx.pubsub.PubSubManager;
 import org.jxmpp.jid.BareJid;
 import org.jxmpp.jid.EntityBareJid;
 
-public final class OpenPgpManager extends Manager implements PEPListener {
+public final class OpenPgpManager extends Manager {
+
+    private static final Logger LOGGER = Logger.getLogger(OpenPgpManager.class.getName());
 
     public static final String PEP_NODE_PUBLIC_KEYS = "urn:xmpp:openpgp:0:public-keys";
     public static final String PEP_NODE_PUBLIC_KEYS_NOTIFY = PEP_NODE_PUBLIC_KEYS + "+notify";
@@ -57,7 +63,7 @@ public final class OpenPgpManager extends Manager implements PEPListener {
         super(connection);
 
         // Subscribe to public key changes
-        PEPManager.getInstanceFor(connection()).addPEPListener(this);
+        PEPManager.getInstanceFor(connection()).addPEPListener(metadataListener);
         ServiceDiscoveryManager.getInstanceFor(connection())
                 .addFeature(PEP_NODE_PUBLIC_KEYS_NOTIFY);
     }
@@ -73,7 +79,6 @@ public final class OpenPgpManager extends Manager implements PEPListener {
 
     public void setOpenPgpProvider(OpenPgpProvider provider) {
         this.provider = provider;
-
     }
 
     public void publishPublicKey() throws Exception {
@@ -89,6 +94,7 @@ public final class OpenPgpManager extends Manager implements PEPListener {
         LeafNode keyNode = pm.getOrCreateLeafNode(keyNodeName);
         List<Item> items = keyNode.getItems(1);
         if (items.isEmpty()) {
+            LOGGER.log(Level.FINE, "Node " + keyNodeName + " is empty. Publish.");
             keyNode.publish(new PayloadItem<>(pubkeyElement));
         }
 
@@ -116,11 +122,17 @@ public final class OpenPgpManager extends Manager implements PEPListener {
         return fetchPubkeysList(connection().getUser().asBareJid());
     }
 
+    public void deletePubkeysListNode()
+            throws XMPPException.XMPPErrorException, SmackException.NotConnectedException, InterruptedException,
+            SmackException.NoResponseException {
+        PubSubManager pm = PubSubManager.getInstance(connection(), connection().getUser().asBareJid());
+        pm.deleteNode(PEP_NODE_PUBLIC_KEYS);
+    }
+
     public PublicKeysListElement fetchPubkeysList(BareJid jid)
             throws InterruptedException, PubSubException.NotALeafNodeException, SmackException.NoResponseException,
             SmackException.NotConnectedException, XMPPException.XMPPErrorException,
-            PubSubException.NotAPubSubNodeException
-    {
+            PubSubException.NotAPubSubNodeException {
         PubSubManager pm = PubSubManager.getInstance(connection(), jid);
 
         LeafNode node = pm.getLeafNode(PEP_NODE_PUBLIC_KEYS);
@@ -171,8 +183,30 @@ public final class OpenPgpManager extends Manager implements PEPListener {
         }
     }
 
-    @Override
-    public void eventReceived(EntityBareJid from, EventElement event, Message message) {
-
+    public boolean canSyncSecretKey()
+            throws XMPPException.XMPPErrorException, SmackException.NotConnectedException, InterruptedException,
+            SmackException.NoResponseException {
+        boolean pep = PEPManager.getInstanceFor(connection()).isSupported();
+        boolean whitelist = PubSubManager.getInstance(connection(), connection().getUser().asBareJid())
+                .getSupportedFeatures().containsFeature("http://jabber.org/protocol/pubsub#access-whitelist");
+        return pep && whitelist;
     }
+
+    private final PEPListener metadataListener = new PEPListener() {
+        @Override
+        public void eventReceived(EntityBareJid from, final EventElement event, Message message) {
+            if (PEP_NODE_PUBLIC_KEYS.equals(event.getEvent().getNode())) {
+                LOGGER.log(Level.INFO, "Received OpenPGP metadata update from " + from);
+                Async.go(new Runnable() {
+                    @Override
+                    public void run() {
+                        ItemsExtension items = (ItemsExtension) event.getExtensions().get(0);
+                        PayloadItem<?> payload = (PayloadItem) items.getItems().get(0);
+                        PublicKeysListElement listElement = (PublicKeysListElement) payload.getPayload();
+
+                    }
+                }, "ProcessOXPublicKey");
+            }
+        }
+    };
 }
diff --git a/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/OpenPgpMessage.java b/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/OpenPgpMessage.java
index f438169d3..a891371cb 100644
--- a/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/OpenPgpMessage.java
+++ b/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/OpenPgpMessage.java
@@ -18,7 +18,6 @@ package org.jivesoftware.smackx.ox;
 
 import java.io.IOException;
 
-import org.jivesoftware.smackx.ox.element.CryptElement;
 import org.jivesoftware.smackx.ox.element.OpenPgpContentElement;
 import org.jivesoftware.smackx.ox.element.SignElement;
 import org.jivesoftware.smackx.ox.element.SigncryptElement;
@@ -40,9 +39,8 @@ public class OpenPgpMessage {
 
     private OpenPgpContentElement openPgpContentElement;
 
-    public OpenPgpMessage(State state, String content) {
+    public OpenPgpMessage(String content) {
         this.element = content;
-        this.state = state;
     }
 
     public OpenPgpContentElement getOpenPgpContentElement() throws XmlPullParserException, IOException {
@@ -56,38 +54,16 @@ public class OpenPgpMessage {
             return;
 
         openPgpContentElement = OpenPgpContentElementProvider.parseOpenPgpContentElement(element);
-        if (state == null) {
-            if (openPgpContentElement instanceof SigncryptElement) {
-                state = State.signcrypt;
-            } else if (openPgpContentElement instanceof SignElement) {
-                state = State.sign;
-            } else {
-                state = State.crypt;
-            }
+        if (openPgpContentElement == null) {
             return;
         }
-        switch (state) {
-        case signcrypt:
-            if (!(openPgpContentElement instanceof SigncryptElement)) {
-                throw new IllegalStateException(
-                        "The used OpenPGP content element does not match the mode used in the raw OpenPGP message. Content element: "
-                                + openPgpContentElement.getElementName() + ". Mode: " + state);
-            }
-            break;
-        case sign:
-            if (!(openPgpContentElement instanceof SignElement)) {
-                throw new IllegalStateException(
-                        "The used OpenPGP content element does not match the mode used in the raw OpenPGP message. Content element: "
-                                + openPgpContentElement.getElementName() + ". Mode: " + state);
-            }
-            break;
-        case crypt:
-            if (!(openPgpContentElement instanceof CryptElement)) {
-                throw new IllegalStateException(
-                        "The used OpenPGP content element does not match the mode used in the raw OpenPGP message. Content element: "
-                                + openPgpContentElement.getElementName() + ". Mode: " + state);
-            }
-            break;
+
+        if (openPgpContentElement instanceof SigncryptElement) {
+            state = State.signcrypt;
+        } else if (openPgpContentElement instanceof SignElement) {
+            state = State.sign;
+        } else {
+            state = State.crypt;
         }
     }
 }
diff --git a/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/OpenPgpMessageListener.java b/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/OpenPgpMessageListener.java
new file mode 100644
index 000000000..ffb4d99d7
--- /dev/null
+++ b/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/OpenPgpMessageListener.java
@@ -0,0 +1,31 @@
+/**
+ *
+ * Copyright 2018 Paul Schaub.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jivesoftware.smackx.ox;
+
+import org.jivesoftware.smackx.ox.element.CryptElement;
+import org.jivesoftware.smackx.ox.element.SignElement;
+import org.jivesoftware.smackx.ox.element.SigncryptElement;
+
+import org.jxmpp.jid.BareJid;
+
+public interface OpenPgpMessageListener {
+    void signcryptElementReceived(BareJid from, SigncryptElement signcryptElement);
+
+    void signElementReceived(BareJid from, SignElement signElement);
+
+    void cryptElementReceived(BareJid from, CryptElement cryptElement);
+}
diff --git a/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/OpenPgpProvider.java b/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/OpenPgpProvider.java
index 9ce98ee0e..55881e945 100644
--- a/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/OpenPgpProvider.java
+++ b/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/OpenPgpProvider.java
@@ -21,6 +21,7 @@ import java.util.Set;
 
 import org.jivesoftware.smackx.ox.element.OpenPgpElement;
 import org.jivesoftware.smackx.ox.element.PubkeyElement;
+import org.jivesoftware.smackx.ox.element.PublicKeysListElement;
 
 import org.jxmpp.jid.BareJid;
 
@@ -30,10 +31,16 @@ public interface OpenPgpProvider {
 
     OpenPgpElement signAndEncrypt(InputStream inputStream, Set<BareJid> recipients) throws Exception;
 
+    OpenPgpElement sign(InputStream inputStream) throws Exception;
+
+    OpenPgpElement encrypt(InputStream inputStream, Set<BareJid> recipients) throws Exception;
+
     PubkeyElement createPubkeyElement() throws Exception;
 
     void processPubkeyElement(PubkeyElement element, BareJid from) throws Exception;
 
+    void processPublicKeysListElement(PublicKeysListElement listElement, BareJid from) throws Exception;
+
     /**
      * Return the OpenPGP v4-fingerprint of our key in hexadecimal upper case.
      *
diff --git a/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/PubSubHelper.java b/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/PubSubHelper.java
new file mode 100644
index 000000000..305a886c9
--- /dev/null
+++ b/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/PubSubHelper.java
@@ -0,0 +1,46 @@
+/**
+ *
+ * Copyright 2018 Paul Schaub.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jivesoftware.smackx.ox;
+
+import org.jivesoftware.smack.SmackException;
+import org.jivesoftware.smack.XMPPException;
+import org.jivesoftware.smackx.pubsub.AccessModel;
+import org.jivesoftware.smackx.pubsub.ConfigureForm;
+import org.jivesoftware.smackx.pubsub.LeafNode;
+
+public class PubSubHelper {
+
+    public static void whitelist(LeafNode node)
+            throws XMPPException.XMPPErrorException, SmackException.NotConnectedException, InterruptedException,
+            SmackException.NoResponseException {
+        ConfigureForm config = node.getNodeConfiguration();
+        if (config.getAccessModel() != AccessModel.whitelist) {
+            config.setAccessModel(AccessModel.whitelist);
+            node.sendConfigurationForm(config);
+        }
+    }
+
+    public static void open(LeafNode node)
+            throws XMPPException.XMPPErrorException, SmackException.NotConnectedException, InterruptedException,
+            SmackException.NoResponseException {
+        ConfigureForm config = node.getNodeConfiguration();
+        if (config.getAccessModel() != AccessModel.open) {
+            config.setAccessModel(AccessModel.open);
+            node.sendConfigurationForm(config);
+        }
+    }
+}
diff --git a/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/provider/OpenPgpContentElementProvider.java b/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/provider/OpenPgpContentElementProvider.java
index e75f6f59d..1deaa2515 100644
--- a/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/provider/OpenPgpContentElementProvider.java
+++ b/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/provider/OpenPgpContentElementProvider.java
@@ -55,7 +55,7 @@ public abstract class OpenPgpContentElementProvider<O extends OpenPgpContentElem
     }
 
     public static OpenPgpContentElement parseOpenPgpContentElement(XmlPullParser parser)
-            throws  XmlPullParserException, IOException {
+            throws  XmlPullParserException {
         try {
             switch (parser.getName()) {
                 case SigncryptElement.ELEMENT: