diff --git a/state.go b/state.go
index 8b7b9ba..723b368 100644
--- a/state.go
+++ b/state.go
@@ -490,3 +490,8 @@ func (s *HandshakeState) ChannelBinding() []byte {
 func (s *HandshakeState) PeerStatic() []byte {
 	return s.rs
 }
+
+// MessageIndex returns the current handshake message id
+func (s *HandshakeState) MessageIndex() int {
+	return s.msgIdx
+}