diff --git a/src/mimefactory.rs b/src/mimefactory.rs
index c82cd416b..0034a1db5 100644
--- a/src/mimefactory.rs
+++ b/src/mimefactory.rs
@@ -2309,7 +2309,7 @@ pub(crate) async fn render_symm_encrypted_securejoin_message(
             "Auto-Submitted",
             mail_builder::headers::raw::Raw::new("auto-generated".to_string()).into(),
         ));
-    } else if step != "vc-request" {
+    } else if step != "vc-request-pubkey" {
         headers.push((
             "Auto-Submitted",
             mail_builder::headers::raw::Raw::new("auto-replied".to_string()).into(),
diff --git a/src/securejoin.rs b/src/securejoin.rs
index 816c4b368..70e7bb018 100644
--- a/src/securejoin.rs
+++ b/src/securejoin.rs
@@ -515,7 +515,7 @@ pub(crate) async fn handle_securejoin_handshake(
             ====             Bob - the joiner's side             =====
             ====   Step 4 in "Setup verified contact" protocol   =====
             ========================================================*/
-            bob::handle_auth_required(context, mime_message).await
+            bob::handle_auth_required_or_pubkey(context, mime_message).await
         }
         SecureJoinStep::RequestPubkey => {
             /*========================================================
@@ -562,7 +562,7 @@ pub(crate) async fn handle_securejoin_handshake(
             ====             Bob - the joiner's side             =====
             ====     Alice sent us her pubkey (Securejoin v3)    =====
             ========================================================*/
-            todo!("Hocuri Pubkey not implemented")
+            bob::handle_auth_required_or_pubkey(context, mime_message).await
         }
         SecureJoinStep::RequestWithAuth => {
             /*==========================================================
diff --git a/src/securejoin/bob.rs b/src/securejoin/bob.rs
index fadf7cde4..e4e9befa3 100644
--- a/src/securejoin/bob.rs
+++ b/src/securejoin/bob.rs
@@ -215,11 +215,11 @@ LIMIT 1
     Ok(())
 }
 
-/// Handles `vc-auth-required` and `vg-auth-required` handshake messages.
+/// Handles `vc-auth-required`, `vg-auth-required`, and `vc-pubkey` handshake messages.
 ///
 /// # Bob - the joiner's side
 /// ## Step 4 in the "Setup Contact protocol"
-pub(super) async fn handle_auth_required(
+pub(super) async fn handle_auth_required_or_pubkey(
     context: &Context,
     message: &MimeMessage,
 ) -> Result<HandshakeMessage> {