diff --git a/generator/osm2meta.hpp b/generator/osm2meta.hpp
index 6437d614a1..509844e3f3 100644
--- a/generator/osm2meta.hpp
+++ b/generator/osm2meta.hpp
@@ -87,6 +87,12 @@ public:
       if (!value.empty())
         m_params.GetMetadata().Add(feature::FeatureMetadata::FMD_TURN_LANES_BACKWARD, value);
     }
+    else if (k == "email" || k == "contact:email")
+    {
+      string const & value = ValidateAndFormat_email(v);
+      if (!value.empty())
+        m_params.GetMetadata().Add(feature::FeatureMetadata::FMD_EMAIL, value);
+    }
     return false;
   }
 
@@ -157,5 +163,9 @@ protected:
   {
     return v;
   }
+  string ValidateAndFormat_email(string const & v) const
+  {
+    return v;
+  }
 
 };
diff --git a/indexer/feature_meta.hpp b/indexer/feature_meta.hpp
index ccd972eede..2bfdd6263b 100644
--- a/indexer/feature_meta.hpp
+++ b/indexer/feature_meta.hpp
@@ -28,7 +28,8 @@ namespace feature
       FMD_ELE,
       FMD_TURN_LANES,
       FMD_TURN_LANES_FORWARD,
-      FMD_TURN_LANES_BACKWARD
+      FMD_TURN_LANES_BACKWARD,
+      FMD_EMAIL
     };
 
     bool Add(EMetadataType type, string const & s)