diff --git a/include/mam_query.hrl b/include/mam_query.hrl
index c0a31d6d..1dc1b8d1 100644
--- a/include/mam_query.hrl
+++ b/include/mam_query.hrl
@@ -1,20 +1,28 @@
 %% Created automatically by xdata generator (xdata_codec.erl)
 %% Source: mam_query.xdata
-%% Form type: urn:xmpp:mam:1
+%% Form type: urn:xmpp:mam:2
 %% Document: XEP-0313
 
 
 -type property() :: {'with', jid:jid()} |
                     {'start', erlang:timestamp()} |
                     {'end', erlang:timestamp()} |
-                    {'withtext', binary()}.
+                    {'withtext', binary()} |
+                    {'after-id', binary()} |
+                    {'before-id', binary()} |
+                    {'ids', [binary()]}.
 -type result() :: [property()].
 
+-type options(T) :: [{binary(), T}].
 -type form_property() ::
       {'with', jid:jid() | undefined} |
       {'start', erlang:timestamp() | undefined} |
       {'end', erlang:timestamp() | undefined} |
-      {'withtext', binary()}.
+      {'withtext', binary()} |
+      {'after-id', binary()} |
+      {'before-id', binary()} |
+      {'ids', [binary()]} |
+      {'ids', [binary()], options(binary())}.
 -type form() :: [form_property() | xdata_field()].
 
 -type error_reason() :: {form_type_mismatch, binary()} |
diff --git a/include/ns.hrl b/include/ns.hrl
index 69254f5b..ae990b74 100644
--- a/include/ns.hrl
+++ b/include/ns.hrl
@@ -152,6 +152,7 @@
 -define(NS_MAM_0, <<"urn:xmpp:mam:0">>).
 -define(NS_MAM_1, <<"urn:xmpp:mam:1">>).
 -define(NS_MAM_2, <<"urn:xmpp:mam:2">>).
+-define(NS_MAM_2_EXTENDED, <<"urn:xmpp:mam:2#extended">>).
 -define(NS_MAM_FULLTEXT_0, <<"urn:xmpp:fulltext:0">>).
 -define(NS_SID_0, <<"urn:xmpp:sid:0">>).
 -define(NS_INBOX_1, <<"urn:xmpp:inbox:1">>).
diff --git a/include/xmpp_codec.hrl b/include/xmpp_codec.hrl
index 1c08e226..a27a7106 100644
--- a/include/xmpp_codec.hrl
+++ b/include/xmpp_codec.hrl
@@ -274,6 +274,10 @@
 -record(gone, {uri = <<>> :: binary()}).
 -type gone() :: #gone{}.
 
+-record(mam_metadata_end, {id = <<>> :: binary(),
+                           timestamp :: erlang:timestamp()}).
+-type mam_metadata_end() :: #mam_metadata_end{}.
+
 -record(message_thread, {parent = <<>> :: binary(),
                          data = <<>> :: binary()}).
 -type message_thread() :: #message_thread{}.
@@ -311,6 +315,10 @@
                     xmlns = <<>> :: binary()}).
 -type sm_resume() :: #sm_resume{}.
 
+-record(mam_metadata_start, {id = <<>> :: binary(),
+                             timestamp :: erlang:timestamp()}).
+-type mam_metadata_start() :: #mam_metadata_start{}.
+
 -record(jingle_content, {creator :: 'initiator' | 'responder',
                          disposition = <<>> :: binary(),
                          name = <<>> :: binary(),
@@ -384,6 +392,10 @@
                 desc = <<>> :: binary()}).
 -type delay() :: #delay{}.
 
+-record(mam_metadata, {start :: 'undefined' | #mam_metadata_start{},
+                       'end' :: 'undefined' | #mam_metadata_end{}}).
+-type mam_metadata() :: #mam_metadata{}.
+
 -record(handshake, {data = <<>> :: binary()}).
 -type handshake() :: #handshake{}.
 
@@ -915,12 +927,6 @@
 -record(muc_hats, {hats = [] :: [#muc_hat{}]}).
 -type muc_hats() :: #muc_hats{}.
 
--record(oob_x, {url :: binary(),
-                desc = <<>> :: binary(),
-                sid = <<>> :: binary(),
-                sub_els = [] :: [xmpp_element() | fxml:xmlel()]}).
--type oob_x() :: #oob_x{}.
-
 -record(x509_ca_list, {certs = [] :: [binary()]}).
 -type x509_ca_list() :: #x509_ca_list{}.
 
@@ -1468,6 +1474,12 @@
                      sub_els = [] :: [xmpp_element() | fxml:xmlel()]}).
 -type vcard_temp() :: #vcard_temp{}.
 
+-record(oob_x, {url :: binary(),
+                desc = <<>> :: binary(),
+                sid = <<>> :: binary(),
+                sub_els = [] :: [xmpp_element() | fxml:xmlel()]}).
+-type oob_x() :: #oob_x{}.
+
 -type xmpp_element() :: address() |
                         addresses() |
                         adhoc_actions() |
@@ -1557,6 +1569,9 @@
                         legacy_auth_feature() |
                         mam_archived() |
                         mam_fin() |
+                        mam_metadata() |
+                        mam_metadata_end() |
+                        mam_metadata_start() |
                         mam_prefs() |
                         mam_query() |
                         mam_result() |
diff --git a/specs/mam_query.xdata b/specs/mam_query.xdata
index 52f12bfc..96372c98 100644
--- a/specs/mam_query.xdata
+++ b/specs/mam_query.xdata
@@ -1,5 +1,5 @@
 <form_type>
-  <name>urn:xmpp:mam:1</name>
+  <name>urn:xmpp:mam:2</name>
   <doc>XEP-0313</doc>
   <desc>Form to query message archives</desc>
   <field var='with'
@@ -14,6 +14,17 @@
   <field var='withtext'
 	 type='text-single'
 	 label='Search the text (obsolete)'/>
+  <field var='after-id'
+         type='text-single'
+         label='Only results after given id'/>
+  <field var='before-id'
+         type='text-single'
+         label='Only results before given id'/>
+  <field var='ids'
+         type='list-multi'
+         label='List of stanza ids to retrieve'>
+    <validate xmlns='http://jabber.org/protocol/xdata-validate' datatype='xs:string'>
+  <open/></validate></field>
 </form_type>
 
 <!--
diff --git a/specs/xmpp_codec.spec b/specs/xmpp_codec.spec
index 31e70d5e..5ba89bfc 100644
--- a/specs/xmpp_codec.spec
+++ b/specs/xmpp_codec.spec
@@ -3237,6 +3237,44 @@
 			  enc = {enc_bool, []}}],
 	   refs = [#ref{name = rsm_set, min = 0, max = 1, label = '$rsm'}]}).
 
+
+-xml(mam_metadata_start,
+     #elem{name = <<"start">>,
+           xmlns = <<"urn:xmpp:mam:2">>,
+           module = 'xep0313',
+           result = {mam_metadata_start, '$id', '$timestamp'},
+           attrs = [#attr{name = <<"id">>,
+                          label = '$id',
+                          required = true},
+                    #attr{name = <<"timestamp">>,
+                          label = '$timestamp',
+                          required = true,
+                          dec = {dec_utc, []},
+                          enc = {enc_utc, []}}]}).
+
+-xml(mam_metadata_end,
+     #elem{name = <<"end">>,
+           xmlns = <<"urn:xmpp:mam:2">>,
+           module = 'xep0313',
+           result = {mam_metadata_end, '$id', '$timestamp'},
+           attrs = [#attr{name = <<"id">>,
+                          label = '$id',
+                          required = true},
+                    #attr{name = <<"timestamp">>,
+                          label = '$timestamp',
+                          required = true,
+                          dec = {dec_utc, []},
+                          enc = {enc_utc, []}}]}).
+
+-xml(mam_metadata,
+     #elem{name = <<"metadata">>,
+           xmlns = [<<"urn:xmpp:mam:2">>],
+           module = 'xep0313',
+           result = {mam_metadata, '$start', '$end'},
+           refs = [#ref{name = mam_metadata_start, label = '$start', min=0, max=1},
+                   #ref{name = mam_metadata_end, label = '$end', min=0, max=1}]
+          }).
+
 -xml(forwarded,
      #elem{name = <<"forwarded">>,
            xmlns = <<"urn:xmpp:forward:0">>,
diff --git a/src/mam_query.erl b/src/mam_query.erl
index d0f38875..b7f43414 100644
--- a/src/mam_query.erl
+++ b/src/mam_query.erl
@@ -1,6 +1,6 @@
 %% Created automatically by xdata generator (xdata_codec.erl)
 %% Source: mam_query.xdata
-%% Form type: urn:xmpp:mam:1
+%% Form type: urn:xmpp:mam:2
 %% Document: XEP-0313
 
 -module(mam_query).
@@ -67,7 +67,13 @@
 -spec encode(form(), binary()) -> [xdata_field()].
 
 -spec encode(form(), binary(),
-             [with | start | 'end' | withtext]) -> [xdata_field()].
+             [with |
+              start |
+              'end' |
+              withtext |
+              'after-id' |
+              'before-id' |
+              ids]) -> [xdata_field()].
 
 dec_int(Val) -> dec_int(Val, infinity, infinity).
 
@@ -158,7 +164,7 @@ io_format_error({missing_required_var, Var, Type}) ->
      [Var, Type]}.
 
 decode(Fs) ->
-    decode(Fs, [<<"urn:xmpp:mam:1">>], [], []).
+    decode(Fs, [<<"urn:xmpp:mam:2">>], [], []).
 
 decode(Fs, XMLNSList) -> decode(Fs, XMLNSList, [], []).
 
@@ -197,11 +203,29 @@ encode(List, Lang, Required) ->
                   [encode_withtext(Val,
                                    Lang,
                                    lists:member(withtext, Required))];
+              {'after-id', Val} ->
+                  ['encode_after-id'(Val,
+                                     Lang,
+                                     lists:member('after-id', Required))];
+              {'before-id', Val} ->
+                  ['encode_before-id'(Val,
+                                      Lang,
+                                      lists:member('before-id', Required))];
+              {ids, Val} ->
+                  [encode_ids(Val,
+                              default,
+                              Lang,
+                              lists:member(ids, Required))];
+              {ids, Val, Opts} ->
+                  [encode_ids(Val,
+                              Opts,
+                              Lang,
+                              lists:member(ids, Required))];
               #xdata_field{} -> [Opt]
           end
           || Opt <- List],
     FormType = #xdata_field{var = <<"FORM_TYPE">>,
-                            type = hidden, values = [<<"urn:xmpp:mam:1">>]},
+                            type = hidden, values = [<<"urn:xmpp:mam:2">>]},
     [FormType | lists:flatten(Fs)].
 
 do_decode([#xdata_field{var = <<"with">>,
@@ -322,6 +346,81 @@ do_decode([#xdata_field{var = <<"withtext">>} | _],
           XMLNS, _, _) ->
     erlang:error({?MODULE,
                   {too_many_values, <<"withtext">>, XMLNS}});
+do_decode([#xdata_field{var = <<"after-id">>,
+                        values = [Value]}
+           | Fs],
+          XMLNS, Required, Acc) ->
+    try Value of
+        Result ->
+            do_decode(Fs,
+                      XMLNS,
+                      lists:delete(<<"after-id">>, Required),
+                      [{'after-id', Result} | Acc])
+    catch
+        _:_ ->
+            erlang:error({?MODULE,
+                          {bad_var_value, <<"after-id">>, XMLNS}})
+    end;
+do_decode([#xdata_field{var = <<"after-id">>,
+                        values = []} =
+               F
+           | Fs],
+          XMLNS, Required, Acc) ->
+    do_decode([F#xdata_field{var = <<"after-id">>,
+                             values = [<<>>]}
+               | Fs],
+              XMLNS,
+              Required,
+              Acc);
+do_decode([#xdata_field{var = <<"after-id">>} | _],
+          XMLNS, _, _) ->
+    erlang:error({?MODULE,
+                  {too_many_values, <<"after-id">>, XMLNS}});
+do_decode([#xdata_field{var = <<"before-id">>,
+                        values = [Value]}
+           | Fs],
+          XMLNS, Required, Acc) ->
+    try Value of
+        Result ->
+            do_decode(Fs,
+                      XMLNS,
+                      lists:delete(<<"before-id">>, Required),
+                      [{'before-id', Result} | Acc])
+    catch
+        _:_ ->
+            erlang:error({?MODULE,
+                          {bad_var_value, <<"before-id">>, XMLNS}})
+    end;
+do_decode([#xdata_field{var = <<"before-id">>,
+                        values = []} =
+               F
+           | Fs],
+          XMLNS, Required, Acc) ->
+    do_decode([F#xdata_field{var = <<"before-id">>,
+                             values = [<<>>]}
+               | Fs],
+              XMLNS,
+              Required,
+              Acc);
+do_decode([#xdata_field{var = <<"before-id">>} | _],
+          XMLNS, _, _) ->
+    erlang:error({?MODULE,
+                  {too_many_values, <<"before-id">>, XMLNS}});
+do_decode([#xdata_field{var = <<"ids">>,
+                        values = Values}
+           | Fs],
+          XMLNS, Required, Acc) ->
+    try [Value || Value <- Values] of
+        Result ->
+            do_decode(Fs,
+                      XMLNS,
+                      lists:delete(<<"ids">>, Required),
+                      [{ids, Result} | Acc])
+    catch
+        _:_ ->
+            erlang:error({?MODULE,
+                          {bad_var_value, <<"ids">>, XMLNS}})
+    end;
 do_decode([#xdata_field{var = Var} | Fs], XMLNS,
           Required, Acc) ->
     if Var /= <<"FORM_TYPE">> ->
@@ -389,3 +488,60 @@ encode_withtext(Value, Lang, IsRequired) ->
                  options = Opts, desc = <<>>,
                  label =
                      xmpp_tr:tr(Lang, ?T("Search the text (obsolete)"))}.
+
+-spec 'encode_after-id'(binary(), binary(),
+                        boolean()) -> xdata_field().
+
+'encode_after-id'(Value, Lang, IsRequired) ->
+    Values = case Value of
+                 <<>> -> [];
+                 Value -> [Value]
+             end,
+    Opts = [],
+    #xdata_field{var = <<"after-id">>, values = Values,
+                 required = IsRequired, type = 'text-single',
+                 options = Opts, desc = <<>>,
+                 label =
+                     xmpp_tr:tr(Lang, ?T("Only results after given id"))}.
+
+-spec 'encode_before-id'(binary(), binary(),
+                         boolean()) -> xdata_field().
+
+'encode_before-id'(Value, Lang, IsRequired) ->
+    Values = case Value of
+                 <<>> -> [];
+                 Value -> [Value]
+             end,
+    Opts = [],
+    #xdata_field{var = <<"before-id">>, values = Values,
+                 required = IsRequired, type = 'text-single',
+                 options = Opts, desc = <<>>,
+                 label =
+                     xmpp_tr:tr(Lang, ?T("Only results before given id"))}.
+
+-spec encode_ids([binary()],
+                 default | options(binary()), binary(),
+                 boolean()) -> xdata_field().
+
+encode_ids(Value, Options, Lang, IsRequired) ->
+    Values = case Value of
+                 [] -> [];
+                 Value -> Value
+             end,
+    Opts = if Options == default -> [];
+              true ->
+                  [#xdata_option{label = xmpp_tr:tr(Lang, L), value = V}
+                   || {L, V} <- Options]
+           end,
+    #xdata_field{var = <<"ids">>, values = Values,
+                 required = IsRequired, type = 'list-multi',
+                 options = Opts, desc = <<>>,
+                 label =
+                     xmpp_tr:tr(Lang, ?T("List of stanza ids to retrieve")),
+                 sub_els =
+                     [{xmlel,
+                       <<"validate">>,
+                       [{<<"xmlns">>,
+                         <<"http://jabber.org/protocol/xdata-validate">>},
+                        {<<"datatype">>, <<"xs:string">>}],
+                       [{xmlcdata, <<>>}, {xmlel, <<"open">>, [], []}]}]}.
diff --git a/src/xdata_codec.erl b/src/xdata_codec.erl
index f2ceca78..5da107cb 100644
--- a/src/xdata_codec.erl
+++ b/src/xdata_codec.erl
@@ -50,10 +50,10 @@
 		defaults = [] :: [{binary(), any()}]}).
 
 -define(is_multi_type(T),
-	((T == 'list-multi') or (T == 'jid-multi') or (T == 'text-multi'))).
+	((T == 'list-multi') orelse (T == 'jid-multi') orelse (T == 'text-multi'))).
 
 -define(is_list_type(T),
-	((T == 'list-single') or (T == 'list-multi'))).
+	((T == 'list-single') orelse (T == 'list-multi'))).
 
 %%%===================================================================
 %%% API
@@ -509,7 +509,7 @@ mk_decoder([], State) ->
 mk_encoders(Fs, State) ->
     lists:foreach(
       fun(#xdata_field{var = Var, desc = Desc,
-		       label = Label, type = Type} = F) ->
+		       label = Label, type = Type, sub_els = SubEls} = F) ->
 	      Spec0 = mk_typespec(F, State),
 	      Spec1 = case default(F, State) of
 			  undefined -> Spec0 ++ " | undefined";
@@ -538,16 +538,31 @@ mk_encoders(Fs, State) ->
 			   "'encode_~s'(Value, Lang, IsRequired) ->",
 			   [FieldName, Spec1, FieldName])
 	      end,
-	      emit("  Values = ~s,"
-		   "  Opts = ~s,"
-		   "  #xdata_field{var = ~p,"
-		   "               values = Values,"
-		   "               required = IsRequired,"
-		   "               type = ~p,"
-		   "               options = Opts,"
-		   "               desc = ~s,"
-		   "               label = ~s}.~n",
-		   [EncVals, EncOpts, Var, Type, DescStr, LabelStr])
+              if
+		  ?is_multi_type(Type) andalso SubEls =/= [] ->
+		      emit("  Values = ~s,"
+			   "  Opts = ~s,"
+			   "  #xdata_field{var = ~p,"
+			   "               values = Values,"
+			   "               required = IsRequired,"
+			   "               type = ~p,"
+			   "               options = Opts,"
+			   "               desc = ~s,"
+			   "               label = ~s,"
+			   "               sub_els = ~p}.~n",
+			   [EncVals, EncOpts, Var, Type, DescStr, LabelStr, SubEls]);
+		  true ->
+		      emit("  Values = ~s,"
+			   "  Opts = ~s,"
+			   "  #xdata_field{var = ~p,"
+			   "               values = Values,"
+			   "               required = IsRequired,"
+			   "               type = ~p,"
+			   "               options = Opts,"
+			   "               desc = ~s,"
+			   "               label = ~s}.~n",
+			   [EncVals, EncOpts, Var, Type, DescStr, LabelStr])
+	      end
       end, Fs).
 
 mk_encoded_values(#xdata_field{var = Var, type = Type,
diff --git a/src/xep0313.erl b/src/xep0313.erl
index ad4edb6f..12239e23 100644
--- a/src/xep0313.erl
+++ b/src/xep0313.erl
@@ -5,6 +5,16 @@
 
 -compile(export_all).
 
+do_decode(<<"metadata">>, <<"urn:xmpp:mam:2">>, El,
+          Opts) ->
+    decode_mam_metadata(<<"urn:xmpp:mam:2">>, Opts, El);
+do_decode(<<"end">>, <<"urn:xmpp:mam:2">>, El, Opts) ->
+    decode_mam_metadata_end(<<"urn:xmpp:mam:2">>, Opts, El);
+do_decode(<<"start">>, <<"urn:xmpp:mam:2">>, El,
+          Opts) ->
+    decode_mam_metadata_start(<<"urn:xmpp:mam:2">>,
+                              Opts,
+                              El);
 do_decode(<<"fin">>, <<"urn:xmpp:mam:0">>, El, Opts) ->
     decode_mam_fin(<<"urn:xmpp:mam:0">>, Opts, El);
 do_decode(<<"fin">>, <<"urn:xmpp:mam:1">>, El, Opts) ->
@@ -104,7 +114,10 @@ do_decode(Name, XMLNS, _, _) ->
     erlang:error({xmpp_codec, {unknown_tag, Name, XMLNS}}).
 
 tags() ->
-    [{<<"fin">>, <<"urn:xmpp:mam:0">>},
+    [{<<"metadata">>, <<"urn:xmpp:mam:2">>},
+     {<<"end">>, <<"urn:xmpp:mam:2">>},
+     {<<"start">>, <<"urn:xmpp:mam:2">>},
+     {<<"fin">>, <<"urn:xmpp:mam:0">>},
      {<<"fin">>, <<"urn:xmpp:mam:1">>},
      {<<"fin">>, <<"urn:xmpp:mam:2">>},
      {<<"prefs">>, <<"urn:xmpp:mam:0">>},
@@ -150,10 +163,20 @@ do_encode({mam_result, _, _, _, _} = Result,
 do_encode({mam_prefs, _, _, _, _} = Prefs, TopXMLNS) ->
     encode_mam_prefs(Prefs, TopXMLNS);
 do_encode({mam_fin, _, _, _, _, _} = Fin, TopXMLNS) ->
-    encode_mam_fin(Fin, TopXMLNS).
+    encode_mam_fin(Fin, TopXMLNS);
+do_encode({mam_metadata_start, _, _} = Start,
+          TopXMLNS) ->
+    encode_mam_metadata_start(Start, TopXMLNS);
+do_encode({mam_metadata_end, _, _} = End, TopXMLNS) ->
+    encode_mam_metadata_end(End, TopXMLNS);
+do_encode({mam_metadata, _, _} = Metadata, TopXMLNS) ->
+    encode_mam_metadata(Metadata, TopXMLNS).
 
 do_get_name({mam_archived, _, _}) -> <<"archived">>;
 do_get_name({mam_fin, _, _, _, _, _}) -> <<"fin">>;
+do_get_name({mam_metadata, _, _}) -> <<"metadata">>;
+do_get_name({mam_metadata_end, _, _}) -> <<"end">>;
+do_get_name({mam_metadata_start, _, _}) -> <<"start">>;
 do_get_name({mam_prefs, _, _, _, _}) -> <<"prefs">>;
 do_get_name({mam_query, _, _, _, _, _, _, _, _, _}) ->
     <<"query">>;
@@ -162,6 +185,11 @@ do_get_name({mam_result, _, _, _, _}) -> <<"result">>.
 do_get_ns({mam_archived, _, _}) ->
     <<"urn:xmpp:mam:tmp">>;
 do_get_ns({mam_fin, Xmlns, _, _, _, _}) -> Xmlns;
+do_get_ns({mam_metadata, _, _}) -> <<"urn:xmpp:mam:2">>;
+do_get_ns({mam_metadata_end, _, _}) ->
+    <<"urn:xmpp:mam:2">>;
+do_get_ns({mam_metadata_start, _, _}) ->
+    <<"urn:xmpp:mam:2">>;
 do_get_ns({mam_prefs, Xmlns, _, _, _}) -> Xmlns;
 do_get_ns({mam_query, Xmlns, _, _, _, _, _, _, _, _}) ->
     Xmlns;
@@ -192,6 +220,9 @@ pp(mam_archived, 2) -> [by, id];
 pp(mam_result, 4) -> [xmlns, queryid, id, sub_els];
 pp(mam_prefs, 4) -> [xmlns, default, always, never];
 pp(mam_fin, 5) -> [xmlns, id, rsm, stable, complete];
+pp(mam_metadata_start, 2) -> [id, timestamp];
+pp(mam_metadata_end, 2) -> [id, timestamp];
+pp(mam_metadata, 2) -> [start, 'end'];
 pp(_, _) -> no.
 
 records() ->
@@ -199,7 +230,10 @@ records() ->
      {mam_archived, 2},
      {mam_result, 4},
      {mam_prefs, 4},
-     {mam_fin, 5}].
+     {mam_fin, 5},
+     {mam_metadata_start, 2},
+     {mam_metadata_end, 2},
+     {mam_metadata, 2}].
 
 dec_bool(<<"false">>) -> false;
 dec_bool(<<"0">>) -> false;
@@ -221,6 +255,262 @@ enc_enum(Atom) -> erlang:atom_to_binary(Atom, utf8).
 
 enc_utc(Val) -> xmpp_util:encode_timestamp(Val).
 
+decode_mam_metadata(__TopXMLNS, __Opts,
+                    {xmlel, <<"metadata">>, _attrs, _els}) ->
+    {Start, End} = decode_mam_metadata_els(__TopXMLNS,
+                                           __Opts,
+                                           _els,
+                                           undefined,
+                                           undefined),
+    {mam_metadata, Start, End}.
+
+decode_mam_metadata_els(__TopXMLNS, __Opts, [], Start,
+                        End) ->
+    {Start, End};
+decode_mam_metadata_els(__TopXMLNS, __Opts,
+                        [{xmlel, <<"start">>, _attrs, _} = _el | _els], Start,
+                        End) ->
+    case xmpp_codec:get_attr(<<"xmlns">>,
+                             _attrs,
+                             __TopXMLNS)
+        of
+        <<"urn:xmpp:mam:2">> ->
+            decode_mam_metadata_els(__TopXMLNS,
+                                    __Opts,
+                                    _els,
+                                    decode_mam_metadata_start(<<"urn:xmpp:mam:2">>,
+                                                              __Opts,
+                                                              _el),
+                                    End);
+        _ ->
+            decode_mam_metadata_els(__TopXMLNS,
+                                    __Opts,
+                                    _els,
+                                    Start,
+                                    End)
+    end;
+decode_mam_metadata_els(__TopXMLNS, __Opts,
+                        [{xmlel, <<"end">>, _attrs, _} = _el | _els], Start,
+                        End) ->
+    case xmpp_codec:get_attr(<<"xmlns">>,
+                             _attrs,
+                             __TopXMLNS)
+        of
+        <<"urn:xmpp:mam:2">> ->
+            decode_mam_metadata_els(__TopXMLNS,
+                                    __Opts,
+                                    _els,
+                                    Start,
+                                    decode_mam_metadata_end(<<"urn:xmpp:mam:2">>,
+                                                            __Opts,
+                                                            _el));
+        _ ->
+            decode_mam_metadata_els(__TopXMLNS,
+                                    __Opts,
+                                    _els,
+                                    Start,
+                                    End)
+    end;
+decode_mam_metadata_els(__TopXMLNS, __Opts, [_ | _els],
+                        Start, End) ->
+    decode_mam_metadata_els(__TopXMLNS,
+                            __Opts,
+                            _els,
+                            Start,
+                            End).
+
+encode_mam_metadata({mam_metadata, Start, End},
+                    __TopXMLNS) ->
+    __NewTopXMLNS = xmpp_codec:choose_top_xmlns(<<>>,
+                                                [<<"urn:xmpp:mam:2">>],
+                                                __TopXMLNS),
+    _els = lists:reverse('encode_mam_metadata_$end'(End,
+                                                    __NewTopXMLNS,
+                                                    'encode_mam_metadata_$start'(Start,
+                                                                                 __NewTopXMLNS,
+                                                                                 []))),
+    _attrs = xmpp_codec:enc_xmlns_attrs(__NewTopXMLNS,
+                                        __TopXMLNS),
+    {xmlel, <<"metadata">>, _attrs, _els}.
+
+'encode_mam_metadata_$start'(undefined, __TopXMLNS,
+                             _acc) ->
+    _acc;
+'encode_mam_metadata_$start'(Start, __TopXMLNS, _acc) ->
+    [encode_mam_metadata_start(Start, __TopXMLNS) | _acc].
+
+'encode_mam_metadata_$end'(undefined, __TopXMLNS,
+                           _acc) ->
+    _acc;
+'encode_mam_metadata_$end'(End, __TopXMLNS, _acc) ->
+    [encode_mam_metadata_end(End, __TopXMLNS) | _acc].
+
+decode_mam_metadata_end(__TopXMLNS, __Opts,
+                        {xmlel, <<"end">>, _attrs, _els}) ->
+    {Id, Timestamp} =
+        decode_mam_metadata_end_attrs(__TopXMLNS,
+                                      _attrs,
+                                      undefined,
+                                      undefined),
+    {mam_metadata_end, Id, Timestamp}.
+
+decode_mam_metadata_end_attrs(__TopXMLNS,
+                              [{<<"id">>, _val} | _attrs], _Id, Timestamp) ->
+    decode_mam_metadata_end_attrs(__TopXMLNS,
+                                  _attrs,
+                                  _val,
+                                  Timestamp);
+decode_mam_metadata_end_attrs(__TopXMLNS,
+                              [{<<"timestamp">>, _val} | _attrs], Id,
+                              _Timestamp) ->
+    decode_mam_metadata_end_attrs(__TopXMLNS,
+                                  _attrs,
+                                  Id,
+                                  _val);
+decode_mam_metadata_end_attrs(__TopXMLNS, [_ | _attrs],
+                              Id, Timestamp) ->
+    decode_mam_metadata_end_attrs(__TopXMLNS,
+                                  _attrs,
+                                  Id,
+                                  Timestamp);
+decode_mam_metadata_end_attrs(__TopXMLNS, [], Id,
+                              Timestamp) ->
+    {decode_mam_metadata_end_attr_id(__TopXMLNS, Id),
+     decode_mam_metadata_end_attr_timestamp(__TopXMLNS,
+                                            Timestamp)}.
+
+encode_mam_metadata_end({mam_metadata_end,
+                         Id,
+                         Timestamp},
+                        __TopXMLNS) ->
+    __NewTopXMLNS =
+        xmpp_codec:choose_top_xmlns(<<"urn:xmpp:mam:2">>,
+                                    [],
+                                    __TopXMLNS),
+    _els = [],
+    _attrs =
+        encode_mam_metadata_end_attr_timestamp(Timestamp,
+                                               encode_mam_metadata_end_attr_id(Id,
+                                                                               xmpp_codec:enc_xmlns_attrs(__NewTopXMLNS,
+                                                                                                          __TopXMLNS))),
+    {xmlel, <<"end">>, _attrs, _els}.
+
+decode_mam_metadata_end_attr_id(__TopXMLNS,
+                                undefined) ->
+    erlang:error({xmpp_codec,
+                  {missing_attr, <<"id">>, <<"end">>, __TopXMLNS}});
+decode_mam_metadata_end_attr_id(__TopXMLNS, _val) ->
+    _val.
+
+encode_mam_metadata_end_attr_id(_val, _acc) ->
+    [{<<"id">>, _val} | _acc].
+
+decode_mam_metadata_end_attr_timestamp(__TopXMLNS,
+                                       undefined) ->
+    erlang:error({xmpp_codec,
+                  {missing_attr,
+                   <<"timestamp">>,
+                   <<"end">>,
+                   __TopXMLNS}});
+decode_mam_metadata_end_attr_timestamp(__TopXMLNS,
+                                       _val) ->
+    try dec_utc(_val) of
+        _res -> _res
+    catch
+        error:_ ->
+            erlang:error({xmpp_codec,
+                          {bad_attr_value,
+                           <<"timestamp">>,
+                           <<"end">>,
+                           __TopXMLNS}})
+    end.
+
+encode_mam_metadata_end_attr_timestamp(_val, _acc) ->
+    [{<<"timestamp">>, enc_utc(_val)} | _acc].
+
+decode_mam_metadata_start(__TopXMLNS, __Opts,
+                          {xmlel, <<"start">>, _attrs, _els}) ->
+    {Id, Timestamp} =
+        decode_mam_metadata_start_attrs(__TopXMLNS,
+                                        _attrs,
+                                        undefined,
+                                        undefined),
+    {mam_metadata_start, Id, Timestamp}.
+
+decode_mam_metadata_start_attrs(__TopXMLNS,
+                                [{<<"id">>, _val} | _attrs], _Id, Timestamp) ->
+    decode_mam_metadata_start_attrs(__TopXMLNS,
+                                    _attrs,
+                                    _val,
+                                    Timestamp);
+decode_mam_metadata_start_attrs(__TopXMLNS,
+                                [{<<"timestamp">>, _val} | _attrs], Id,
+                                _Timestamp) ->
+    decode_mam_metadata_start_attrs(__TopXMLNS,
+                                    _attrs,
+                                    Id,
+                                    _val);
+decode_mam_metadata_start_attrs(__TopXMLNS,
+                                [_ | _attrs], Id, Timestamp) ->
+    decode_mam_metadata_start_attrs(__TopXMLNS,
+                                    _attrs,
+                                    Id,
+                                    Timestamp);
+decode_mam_metadata_start_attrs(__TopXMLNS, [], Id,
+                                Timestamp) ->
+    {decode_mam_metadata_start_attr_id(__TopXMLNS, Id),
+     decode_mam_metadata_start_attr_timestamp(__TopXMLNS,
+                                              Timestamp)}.
+
+encode_mam_metadata_start({mam_metadata_start,
+                           Id,
+                           Timestamp},
+                          __TopXMLNS) ->
+    __NewTopXMLNS =
+        xmpp_codec:choose_top_xmlns(<<"urn:xmpp:mam:2">>,
+                                    [],
+                                    __TopXMLNS),
+    _els = [],
+    _attrs =
+        encode_mam_metadata_start_attr_timestamp(Timestamp,
+                                                 encode_mam_metadata_start_attr_id(Id,
+                                                                                   xmpp_codec:enc_xmlns_attrs(__NewTopXMLNS,
+                                                                                                              __TopXMLNS))),
+    {xmlel, <<"start">>, _attrs, _els}.
+
+decode_mam_metadata_start_attr_id(__TopXMLNS,
+                                  undefined) ->
+    erlang:error({xmpp_codec,
+                  {missing_attr, <<"id">>, <<"start">>, __TopXMLNS}});
+decode_mam_metadata_start_attr_id(__TopXMLNS, _val) ->
+    _val.
+
+encode_mam_metadata_start_attr_id(_val, _acc) ->
+    [{<<"id">>, _val} | _acc].
+
+decode_mam_metadata_start_attr_timestamp(__TopXMLNS,
+                                         undefined) ->
+    erlang:error({xmpp_codec,
+                  {missing_attr,
+                   <<"timestamp">>,
+                   <<"start">>,
+                   __TopXMLNS}});
+decode_mam_metadata_start_attr_timestamp(__TopXMLNS,
+                                         _val) ->
+    try dec_utc(_val) of
+        _res -> _res
+    catch
+        error:_ ->
+            erlang:error({xmpp_codec,
+                          {bad_attr_value,
+                           <<"timestamp">>,
+                           <<"start">>,
+                           __TopXMLNS}})
+    end.
+
+encode_mam_metadata_start_attr_timestamp(_val, _acc) ->
+    [{<<"timestamp">>, enc_utc(_val)} | _acc].
+
 decode_mam_fin(__TopXMLNS, __Opts,
                {xmlel, <<"fin">>, _attrs, _els}) ->
     Rsm = decode_mam_fin_els(__TopXMLNS,
diff --git a/src/xmpp_codec.erl b/src/xmpp_codec.erl
index 0d6055d4..1de3dc35 100644
--- a/src/xmpp_codec.erl
+++ b/src/xmpp_codec.erl
@@ -270,6 +270,7 @@ get_mod(<<"error">>, <<"jabber:component:accept">>) ->
 get_mod(<<"password">>, <<"jabber:iq:auth">>) ->
     xep0078;
 get_mod(<<"TZ">>, <<"vcard-temp">>) -> xep0054;
+get_mod(<<"end">>, <<"urn:xmpp:mam:2">>) -> xep0313;
 get_mod(<<"content">>, <<"urn:xmpp:jingle:1">>) ->
     xep0166;
 get_mod(<<"nick">>, <<"storage:bookmarks">>) -> xep0048;
@@ -346,6 +347,7 @@ get_mod(<<"pubsub">>,
         <<"http://jabber.org/protocol/pubsub">>) ->
     xep0060;
 get_mod(<<"tzo">>, <<"urn:xmpp:time">>) -> xep0202;
+get_mod(<<"start">>, <<"urn:xmpp:mam:2">>) -> xep0313;
 get_mod(<<"unsupported-info">>,
         <<"urn:xmpp:jingle:errors:1">>) ->
     xep0166;
@@ -1351,6 +1353,8 @@ get_mod(<<"status">>, <<"jabber:client">>) -> rfc6120;
 get_mod(<<"item">>,
         <<"http://jabber.org/protocol/pubsub#event">>) ->
     xep0060;
+get_mod(<<"metadata">>, <<"urn:xmpp:mam:2">>) ->
+    xep0313;
 get_mod(<<"resumed">>, <<"urn:xmpp:sm:3">>) -> xep0198;
 get_mod(<<"jid">>, <<"urn:xmpp:mix:core:0">>) ->
     xep0369;
@@ -1952,16 +1956,11 @@ get_mod({adhoc_command, _, _, _, _, _, _, _, _}) ->
     xep0050;
 get_mod({media, _, _, _}) -> xep0221;
 get_mod({oob_x, _, _, _, _}) -> xep0066;
-get_mod({identity, _, _, _, _}) -> xep0030;
-get_mod({redirect, _}) -> rfc6120;
-get_mod({muc_history, _, _, _, _}) -> xep0045;
 get_mod({muc_owner, _, _, _}) -> xep0045;
 get_mod({mix_setnick, _, _}) -> xep0369;
 get_mod({mark_received, _}) -> xep0333;
 get_mod({mark_displayed, _}) -> xep0333;
 get_mod({mark_acknowledged, _}) -> xep0333;
-get_mod({jingle_ft_file, _, _, _, _, _, _, _, _}) ->
-    xep0234;
 get_mod({bookmark_url, _, _}) -> xep0048;
 get_mod({gone, _}) -> rfc6120;
 get_mod({sasl_response, _}) -> rfc6120;
@@ -2057,6 +2056,7 @@ get_mod({markable}) -> xep0333;
 get_mod({message_moderated_21, _, _, _, _}) -> xep0425;
 get_mod({bind, _, _}) -> rfc6120;
 get_mod({rsm_first, _, _}) -> xep0059;
+get_mod({mam_metadata_start, _, _}) -> xep0313;
 get_mod({caps, _, _, _, _}) -> xep0115;
 get_mod({xdata, _, _, _, _, _, _}) -> xep0004;
 get_mod({ps_options, _, _, _, _}) -> xep0060;
@@ -2125,6 +2125,7 @@ get_mod({inbox_fin, _, _, _, _}) -> xep0430;
 get_mod({csi, _}) -> xep0352;
 get_mod({pep_bookmarks_conference, _, _, _, _, _}) ->
     xep0402;
+get_mod({mam_metadata, _, _}) -> xep0313;
 get_mod({sm_a, _, _}) -> xep0198;
 get_mod({jingle_s5b_transport, _, _, _, _, _, _, _}) ->
     xep0260;
@@ -2142,6 +2143,7 @@ get_mod({avatar_info, _, _, _, _, _, _}) -> xep0084;
 get_mod({privacy_list, _, _}) -> xep0016;
 get_mod({unified_push_registered, _, _}) -> unifiedpush;
 get_mod({message_thread, _, _}) -> rfc6120;
+get_mod({mam_metadata_end, _, _}) -> xep0313;
 get_mod({forwarded, _, _}) -> xep0297;
 get_mod({feature_sm, _}) -> xep0198;
 get_mod({stanza_id, _, _}) -> xep0359;
@@ -2193,4 +2195,9 @@ get_mod({muc_subscriptions, _}) -> p1_mucsub;
 get_mod({mix, _, _, _, _}) -> xep0369;
 get_mod({addresses, _}) -> xep0033;
 get_mod({ibb_data, _, _, _}) -> xep0047;
+get_mod({identity, _, _, _, _}) -> xep0030;
+get_mod({redirect, _}) -> rfc6120;
+get_mod({muc_history, _, _, _, _}) -> xep0045;
+get_mod({jingle_ft_file, _, _, _, _, _, _, _, _}) ->
+    xep0234;
 get_mod(Record) -> xmpp_codec_external:lookup(Record).