diff --git a/stdlib/2.7/email/__init__.pyi b/stdlib/2.7/email/__init__.pyi
index e69de29bb..384d9567f 100644
--- a/stdlib/2.7/email/__init__.pyi
+++ b/stdlib/2.7/email/__init__.pyi
@@ -0,0 +1,6 @@
+from typing import IO, Any, AnyStr
+
+def message_from_string(s: AnyStr, *args, **kwargs): ...
+def message_from_bytes(s: str, *args, **kwargs): ...
+def message_from_file(fp: IO[AnyStr], *args, **kwargs): ...
+def message_from_binary_file(fp: IO[str], *args, **kwargs): ...
diff --git a/stdlib/3/email/__init__.pyi b/stdlib/3/email/__init__.pyi
index 1a7025fbe..6cf5a070c 100644
--- a/stdlib/3/email/__init__.pyi
+++ b/stdlib/3/email/__init__.pyi
@@ -1,11 +1,11 @@
 # Stubs for email (Python 3.4)
-#
-# NOTE: This dynamically typed stub was automatically generated by stubgen.
 
-def message_from_string(s, *args, **kws): ...
-def message_from_bytes(s, *args, **kws): ...
-def message_from_file(fp, *args, **kws): ...
-def message_from_binary_file(fp, *args, **kws): ...
+from typing import IO, Any
+
+def message_from_string(s: str, *args, **kwargs): ...
+def message_from_bytes(s: bytes, *args, **kwargs): ...
+def message_from_file(fp: IO[str], *args, **kwargs): ...
+def message_from_binary_file(fp: IO[bytes], *args, **kwargs): ...
 
 # Names in __all__ with no definition:
 #   base64mime