diff --git a/lib/ExtractionIterator.re b/lib/ExtractionIterator.re
index bcc2c82..8c73bc3 100644
--- a/lib/ExtractionIterator.re
+++ b/lib/ExtractionIterator.re
@@ -8,30 +8,42 @@ open Longident;
 
 module StringMap = Map.Make(String);
 
-let extractMessageFromLabels = labels => {
-  let map = ref(StringMap.empty);
-  labels
-  |> List.iter(assoc =>
-       switch (assoc) {
-       | (Asttypes.Labelled(key), {pexp_desc: Pexp_constant(Pconst_string(value, _))}) =>
-         map := map^ |> StringMap.add(key, value)
-       | _ => ()
-       }
-     );
-  Message.fromStringMap(map^);
+let extractMessageFromLabels = (callback, labels) => {
+  let map =
+    labels
+    |> List.fold_left(
+         (map, assoc) =>
+           switch (assoc) {
+           | (Asttypes.Labelled(key), {pexp_desc: Pexp_constant(Pconst_string(value, _))}) =>
+             map |> StringMap.add(key, value)
+           | _ => map
+           },
+         StringMap.empty,
+       );
+
+  switch (Message.fromStringMap(map)) {
+  | Some(message) => callback(message)
+  | None => ()
+  };
 };
 
-let extractMessageFromRecord = fields => {
-  let map = ref(StringMap.empty);
-  fields
-  |> List.iter(field =>
-       switch (field) {
-       | ({txt: Lident(key)}, {pexp_desc: Pexp_constant(Pconst_string(value, _))}) =>
-         map := map^ |> StringMap.add(key, value)
-       | _ => ()
-       }
-     );
-  Message.fromStringMap(map^);
+let extractMessageFromRecord = (callback, fields) => {
+  let map =
+    fields
+    |> List.fold_left(
+         (map, field) =>
+           switch (field) {
+           | ({txt: Lident(key)}, {pexp_desc: Pexp_constant(Pconst_string(value, _))}) =>
+             map |> StringMap.add(key, value)
+           | _ => map
+           },
+         StringMap.empty,
+       );
+
+  switch (Message.fromStringMap(map)) {
+  | Some(message) => callback(message)
+  | None => ()
+  };
 };
 
 let extractMessagesFromRecords = (callback, records) =>
@@ -48,14 +60,42 @@ let extractMessagesFromRecords = (callback, records) =>
                )),
            },
          ) =>
-         switch (extractMessageFromRecord(fields)) {
-         | Some(message) => callback(message)
-         | _ => ()
-         }
+         extractMessageFromRecord(callback, fields)
        | _ => ()
        }
      );
 
+let hasIntlAttribute = (items: structure) =>
+  items
+  |> List.exists(item =>
+       switch (item) {
+       | {pstr_desc: Pstr_attribute(({txt: "intl.messages"}, _))} => true
+       | _ => false
+       }
+     );
+
+let extractMessagesFromValueBindings = (callback, valueBindings: list(value_binding)) =>
+  valueBindings
+  |> List.iter(valueBinding =>
+       switch (valueBinding) {
+       | {pvb_pat: {ppat_desc: Ppat_var(_)}, pvb_expr: {pexp_desc: Pexp_record(fields, None)}} =>
+         extractMessageFromRecord(callback, fields)
+       | _ => ()
+       }
+     );
+
+let extractMessagesFromModule = (callback, items: structure) =>
+  if (hasIntlAttribute(items)) {
+    items
+    |> List.iter(item =>
+         switch (item) {
+         | {pstr_desc: Pstr_value(Nonrecursive, valueBindings)} =>
+           extractMessagesFromValueBindings(callback, valueBindings)
+         | _ => ()
+         }
+       );
+  };
+
 let matchesFormattedMessage = ident =>
   switch (ident) {
   | Ldot(Ldot(Lident("ReactIntl"), "FormattedMessage"), "createElement")
@@ -72,15 +112,21 @@ let matchesDefineMessages = ident =>
 
 let getIterator = callback => {
   ...default_iterator,
+
+  // Match records in modules with [@intl.messages]
+  // (structure is the module body - either top level or of a submodule)
+  structure: (iterator, structure) => {
+    extractMessagesFromModule(callback, structure);
+    default_iterator.structure(iterator, structure);
+  },
+
   expr: (iterator, expr) => {
     switch (expr) {
-    /* Match (ReactIntl.)FormattedMessage.createElement */
+    // Match (ReactIntl.)FormattedMessage.createElement
     | {pexp_desc: Pexp_apply({pexp_desc: Pexp_ident({txt, _})}, labels)} when matchesFormattedMessage(txt) =>
-      switch (extractMessageFromLabels(labels)) {
-      | Some(message) => callback(message)
-      | _ => ()
-      }
-    /* Match (ReactIntl.)defineMessages */
+      extractMessageFromLabels(callback, labels)
+
+    // Match (ReactIntl.)defineMessages
     | {
         pexp_desc:
           Pexp_apply(
@@ -101,7 +147,8 @@ let getIterator = callback => {
       }
         when matchesDefineMessages(txt) =>
       extractMessagesFromRecords(callback, fields)
-    /* Match [@intl.messages] */
+
+    // Match [@intl.messages] on objects
     | {
         pexp_desc:
           Pexp_extension((
@@ -111,8 +158,10 @@ let getIterator = callback => {
         pexp_attributes: [({txt: "intl.messages"}, _)],
       } =>
       extractMessagesFromRecords(callback, fields)
+
     | _ => ()
     };
+
     default_iterator.expr(iterator, expr);
   },
 };
diff --git a/lib/ExtractionIterator.rei b/lib/ExtractionIterator.rei
new file mode 100644
index 0000000..88f20ee
--- /dev/null
+++ b/lib/ExtractionIterator.rei
@@ -0,0 +1 @@
+let getIterator: (Message.t => unit) => Ast_iterator.iterator;
diff --git a/test/Test.re b/test/Test.re
index c039c9b..c9cf0ea 100644
--- a/test/Test.re
+++ b/test/Test.re
@@ -45,12 +45,14 @@ module Extract = {
     "defaultMessage": "This is message 1.7",
     "description": "Description for message 1.7"
   },
+  { "id": "test1.msg1.8", "defaultMessage": "This is message 1.8" },
   { "id": "test1.msg2.1", "defaultMessage": "This is message 2.1" },
   {
     "id": "test1.msg2.2",
     "defaultMessage": "This is message 2.2",
     "description": "Description for message 2.2"
   },
+  { "id": "test1.msg3.1", "defaultMessage": "This is message 3.1" },
   { "id": "test2.msg1.1", "defaultMessage": "This is message 2.1.1" }
 ]
 |};
diff --git a/test/test1/Test_1_1.re b/test/test1/Test_1_1.re
index 7fe9b51..118c2ee 100644
--- a/test/test1/Test_1_1.re
+++ b/test/test1/Test_1_1.re
@@ -42,3 +42,19 @@ let _ =
       "description": "Description for message 1.7",
     },
   });
+
+module Msg = {
+  open ReactIntl;
+
+  [@intl.messages];
+
+  let msg18 = {id: "test1.msg1.8", defaultMessage: "This is message 1.8"};
+
+  let ignored1 = {idd: "test1.ignored1.1", defaultMessage: "This message is ignored"};
+};
+
+module Msg2 = {
+  open ReactIntl;
+
+  let ignored2 = {id: "test1.ignored1.2", defaultMessage: "This message is ignored"};
+};
diff --git a/test/test1/Test_1_3.re b/test/test1/Test_1_3.re
new file mode 100644
index 0000000..676ada3
--- /dev/null
+++ b/test/test1/Test_1_3.re
@@ -0,0 +1,5 @@
+open ReactIntl;
+
+[@intl.messages];
+
+let msg3_1 = {id: "test1.msg3.1", defaultMessage: "This is message 3.1"};