diff --git a/package.json b/package.json
index 2819055003..71c3756682 100644
--- a/package.json
+++ b/package.json
@@ -58,7 +58,7 @@
     "libp2p-websocket-star-rendezvous": "~0.3.0",
     "lodash": "^4.17.11",
     "multiaddr": "^6.0.6",
-    "peer-id": "~0.12.2",
+    "peer-id": "~0.12.5",
     "peer-info": "~0.15.1"
   },
   "dependencies": {
diff --git a/src/message/sign.js b/src/message/sign.js
index ae836cc18b..1419bccfee 100644
--- a/src/message/sign.js
+++ b/src/message/sign.js
@@ -72,9 +72,14 @@ function messagePublicKey (message, callback) {
       callback(new Error('Public Key does not match the originator'))
     })
     return
+  } else {
+    // should be available in the from property of the message (peer id)
+    const from = PeerId.createFromBytes(message.from)
+    if (from.pubKey) {
+      return callback(null, from.pubKey)
+    }
   }
-  // TODO: Once js libp2p supports inlining public keys with the peer id
-  // attempt to unmarshal the public key here.
+
   callback(new Error('Could not get the public key from the originator id'))
 }
 
diff --git a/test/sign.spec.js b/test/sign.spec.js
index 4258d255c3..9a65dc5557 100644
--- a/test/sign.spec.js
+++ b/test/sign.spec.js
@@ -56,6 +56,42 @@ describe('message signing', () => {
     })
   })
 
+  it('should be able to extract the public key from an inlined key', (done) => {
+    const testSecp256k1 = (peerId) => {
+      const message = {
+        from: peerId.id,
+        data: 'hello',
+        seqno: randomSeqno(),
+        topicIDs: ['test-topic']
+      }
+
+      const bytesToSign = Buffer.concat([SignPrefix, Message.encode(message)])
+      peerId.privKey.sign(bytesToSign, (err, expectedSignature) => {
+        if (err) return done(err)
+
+        signMessage(peerId, message, (err, signedMessage) => {
+          if (err) return done(err)
+
+          // Check the signature and public key
+          expect(signedMessage.signature).to.eql(expectedSignature)
+          signedMessage.key = undefined
+
+          // Verify the signature
+          verifySignature(signedMessage, (err, verified) => {
+            expect(err).to.not.exist()
+            expect(verified).to.eql(true)
+            done(err)
+          })
+        })
+      })
+    }
+
+    PeerId.create({ keyType: 'secp256k1', bits: 256 }, (err, peerId) => {
+      expect(err).to.not.exist()
+      testSecp256k1(peerId)
+    })
+  })
+
   it('should be able to extract the public key from the message', (done) => {
     const message = {
       from: peerId.id,