diff --git a/include/olm/olm.h b/include/olm/olm.h
index 0886fa9f0e90a2edcfc59b049a8ea1f4668abd6d..81b66028f7c6f9252f5d1f0272ec3bacea833a85 100644
--- a/include/olm/olm.h
+++ b/include/olm/olm.h
@@ -300,6 +300,10 @@ size_t olm_session_id(
     void * id, size_t id_length
 );
 
+int olm_session_has_received_message(
+    OlmSession *session
+);
+
 /** Checks if the PRE_KEY message is for this in-bound session. This can happen
  * if multiple messages are sent to this account before this account sends a
  * message in reply. Returns olm_error() on failure. If the base64
diff --git a/javascript/olm_post.js b/javascript/olm_post.js
index dac89f646aa2f31e84a0df03b83bc8050aebe4a8..8951c11e103a4c74a8c4f00bf4de6d3f2d88f5cd 100644
--- a/javascript/olm_post.js
+++ b/javascript/olm_post.js
@@ -263,6 +263,13 @@ Session.prototype['session_id'] = restore_stack(function() {
     return Pointer_stringify(id_buffer);
 });
 
+Session.prototype['has_received_message'] = function() {
+    return session_method(Module['_olm_session_has_received_message'])(
+        this.ptr
+    ) ? true : false;
+};
+
+
 Session.prototype['matches_inbound'] = restore_stack(function(
     one_time_key_message
 ) {
diff --git a/src/olm.cpp b/src/olm.cpp
index 10e00fafa8f2243e2788588172aa1245cf43cda5..3fe9c5eb6c002c1b7276d16d1735a9d6ee751899 100644
--- a/src/olm.cpp
+++ b/src/olm.cpp
@@ -529,6 +529,12 @@ size_t olm_session_id(
 }
 
 
+int olm_session_has_received_message(
+    OlmSession * session
+) {
+    return from_c(session)->received_message;
+}
+
 size_t olm_matches_inbound_session(
     OlmSession * session,
     void * one_time_key_message, size_t message_length