diff --git a/src/plugins/plugin_xep_0060.py b/src/plugins/plugin_xep_0060.py
index 53539a14..198525f5 100755
--- a/src/plugins/plugin_xep_0060.py
+++ b/src/plugins/plugin_xep_0060.py
@@ -161,9 +161,9 @@ class XEP_0060(object):
             except KeyError:
                 pass
 
-            for name, value in extra:
+            for name, value in extra.iteritems():
                 if name.startswith(MAM_FILTER):
-                    var = name[len[MAM_FILTER]:]
+                    var = name[len(MAM_FILTER):]
                     extra_fields = mam_args.setdefault('extra_fields', [])
                     extra_fields.append(data_form.Field(var=var, value=value))