diff --git a/I2PTunnel.cpp b/I2PTunnel.cpp
index a281334f..9eccc1bd 100644
--- a/I2PTunnel.cpp
+++ b/I2PTunnel.cpp
@@ -196,8 +196,9 @@ namespace client
 			// add X-I2P fields
 			if (m_From)
 			{
+				m_OutHeader << X_I2P_DEST_B32 << ": " << context.GetAddressBook ().ToAddress(m_From->GetIdentHash ()) << "\r\n";
 				m_OutHeader << X_I2P_DEST_HASH << ": " << m_From->GetIdentHash ().ToBase64 () << "\r\n";
-			//	m_OutHeader << X_I2P_DEST_B64 << ": " << m_From->ToBase64 () << "\r\n";
+				m_OutHeader << X_I2P_DEST_B64 << ": " << m_From->ToBase64 () << "\r\n";
 			}
 
 			if (endOfHeader)
diff --git a/I2PTunnel.h b/I2PTunnel.h
index 7a172468..4530a141 100644
--- a/I2PTunnel.h
+++ b/I2PTunnel.h
@@ -21,8 +21,8 @@ namespace client
 	const int I2P_TUNNEL_DESTINATION_REQUEST_TIMEOUT = 10; // in seconds
 	// for HTTP tunnels		
 	const char X_I2P_DEST_HASH[] = "X-I2P-DestHash"; // hash  in base64
-	//const char X_I2P_DEST_B64[] = "X-I2P-DestB64"; // full address in base64
-	//const char X_I2P_DEST_B32[] = "X-I2P-DestB32"; // full address in base32
+	const char X_I2P_DEST_B64[] = "X-I2P-DestB64"; // full address in base64
+	const char X_I2P_DEST_B32[] = "X-I2P-DestB32"; // .b32.i2p address
 
 	class I2PTunnelConnection: public I2PServiceHandler, public std::enable_shared_from_this<I2PTunnelConnection>
 	{