diff --git a/stdlib/2/email/base64mime.pyi b/stdlib/2/email/base64mime.pyi
new file mode 100644
index 000000000..f05003b8d
--- /dev/null
+++ b/stdlib/2/email/base64mime.pyi
@@ -0,0 +1,8 @@
+def base64_len(s: bytes) -> int: ...
+def header_encode(header, charset=..., keep_eols=..., maxlinelen=..., eol=...): ...
+def encode(s, binary=..., maxlinelen=..., eol=...): ...
+body_encode = encode
+encodestring = encode
+def decode(s, convert_eols=...): ...
+body_decode = decode
+decodestring = decode
diff --git a/stdlib/2/email/charset.pyi b/stdlib/2/email/charset.pyi
new file mode 100644
index 000000000..82ba6c0bb
--- /dev/null
+++ b/stdlib/2/email/charset.pyi
@@ -0,0 +1,22 @@
+def add_charset(charset, header_enc=..., body_enc=..., output_charset=...) -> None: ...
+def add_alias(alias, canonical) -> None: ...
+def add_codec(charset, codecname) -> None: ...
+
+class Charset:
+    input_charset = ...
+    header_encoding = ...
+    body_encoding = ...
+    output_charset = ...
+    input_codec = ...
+    output_codec = ...
+    def __init__(self, input_charset=...) -> None: ...
+    def __eq__(self, other): ...
+    def __ne__(self, other): ...
+    def get_body_encoding(self): ...
+    def convert(self, s): ...
+    def to_splittable(self, s): ...
+    def from_splittable(self, ustr, to_output: bool = ...): ...
+    def get_output_charset(self): ...
+    def encoded_header_len(self, s): ...
+    def header_encode(self, s, convert: bool = ...): ...
+    def body_encode(self, s, convert: bool = ...): ...
diff --git a/stdlib/2/email/encoders.pyi b/stdlib/2/email/encoders.pyi
new file mode 100644
index 000000000..5670cbaf0
--- /dev/null
+++ b/stdlib/2/email/encoders.pyi
@@ -0,0 +1,4 @@
+def encode_base64(msg) -> None: ...
+def encode_quopri(msg) -> None: ...
+def encode_7or8bit(msg) -> None: ...
+def encode_noop(msg) -> None: ...
diff --git a/stdlib/2/email/feedparser.pyi b/stdlib/2/email/feedparser.pyi
new file mode 100644
index 000000000..51f825939
--- /dev/null
+++ b/stdlib/2/email/feedparser.pyi
@@ -0,0 +1,18 @@
+class BufferedSubFile:
+    def __init__(self) -> None: ...
+    def push_eof_matcher(self, pred) -> None: ...
+    def pop_eof_matcher(self): ...
+    def close(self) -> None: ...
+    def readline(self): ...
+    def unreadline(self, line) -> None: ...
+    def push(self, data): ...
+    def pushlines(self, lines) -> None: ...
+    def is_closed(self): ...
+    def __iter__(self): ...
+    def next(self): ...
+
+
+class FeedParser:
+    def __init__(self, _factory=...) -> None: ...
+    def feed(self, data) -> None: ...
+    def close(self): ...
diff --git a/stdlib/2/email/generator.pyi b/stdlib/2/email/generator.pyi
new file mode 100644
index 000000000..96cfe2d21
--- /dev/null
+++ b/stdlib/2/email/generator.pyi
@@ -0,0 +1,9 @@
+class Generator:
+    def __init__(self, outfp, mangle_from_: bool = ..., maxheaderlen: int = ...) -> None: ...
+    def write(self, s) -> None: ...
+    def flatten(self, msg, unixfrom: bool = ...) -> None: ...
+    def clone(self, fp): ...
+
+
+class DecodedGenerator(Generator):
+    def __init__(self, outfp, mangle_from_: bool = ..., maxheaderlen: int = ..., fmt=...) -> None: ...
diff --git a/stdlib/2/email/header.pyi b/stdlib/2/email/header.pyi
new file mode 100644
index 000000000..69c936300
--- /dev/null
+++ b/stdlib/2/email/header.pyi
@@ -0,0 +1,11 @@
+def decode_header(header): ...
+def make_header(decoded_seq, maxlinelen=..., header_name=..., continuation_ws=...): ...
+
+class Header:
+    def __init__(self, s=..., charset=..., maxlinelen=..., header_name=..., continuation_ws=...,
+                 errors=...) -> None: ...
+    def __unicode__(self): ...
+    def __eq__(self, other): ...
+    def __ne__(self, other): ...
+    def append(self, s, charset=..., errors=...) -> None: ...
+    def encode(self, splitchars=...): ...
diff --git a/stdlib/2/email/iterators.pyi b/stdlib/2/email/iterators.pyi
new file mode 100644
index 000000000..48aaf06a6
--- /dev/null
+++ b/stdlib/2/email/iterators.pyi
@@ -0,0 +1,5 @@
+from typing import Generator
+
+def walk(self) -> Generator: ...
+def body_line_iterator(msg, decode: bool = ...) -> Generator: ...
+def typed_subpart_iterator(msg, maintype=..., subtype=...) -> Generator: ...
diff --git a/stdlib/2/email/message.pyi b/stdlib/2/email/message.pyi
new file mode 100644
index 000000000..bd3c6220d
--- /dev/null
+++ b/stdlib/2/email/message.pyi
@@ -0,0 +1,45 @@
+from typing import Generator
+
+class Message:
+    preamble = ...
+    epilogue = ...
+    defects = ...
+    def __init__(self): ...
+    def as_string(self, unixfrom=...): ...
+    def is_multipart(self) -> bool: ...
+    def set_unixfrom(self, unixfrom) -> None: ...
+    def get_unixfrom(self): ...
+    def attach(self, payload) -> None: ...
+    def get_payload(self, i=..., decode: bool = ...): ...
+    def set_payload(self, payload, charset=...) -> None: ...
+    def set_charset(self, charset): ...
+    def get_charset(self): ...
+    def __len__(self): ...
+    def __getitem__(self, name): ...
+    def __setitem__(self, name, val) -> None: ...
+    def __delitem__(self, name) -> None: ...
+    def __contains__(self, name): ...
+    def has_key(self, name) -> bool: ...
+    def keys(self): ...
+    def values(self): ...
+    def items(self): ...
+    def get(self, name, failobj=...): ...
+    def get_all(self, name, failobj=...): ...
+    def add_header(self, _name, _value, **_params) -> None: ...
+    def replace_header(self, _name, _value) -> None: ...
+    def get_content_type(self): ...
+    def get_content_maintype(self): ...
+    def get_content_subtype(self): ...
+    def get_default_type(self): ...
+    def set_default_type(self, ctype) -> None: ...
+    def get_params(self, failobj=..., header=..., unquote: bool = ...): ...
+    def get_param(self, param, failobj=..., header=..., unquote: bool = ...): ...
+    def set_param(self, param, value, header=..., requote: bool = ..., charset=..., language=...) -> None: ...
+    def del_param(self, param, header=..., requote: bool = ...): ...
+    def set_type(self, type, header=..., requote: bool = ...): ...
+    def get_filename(self, failobj=...): ...
+    def get_boundary(self, failobj=...): ...
+    def set_boundary(self, boundary) -> None: ...
+    def get_content_charset(self, failobj=...): ...
+    def get_charsets(self, failobj=...): ...
+    def walk(self) -> Generator: ...
diff --git a/stdlib/2/email/mime/audio.pyi b/stdlib/2/email/mime/audio.pyi
new file mode 100644
index 000000000..406ade11b
--- /dev/null
+++ b/stdlib/2/email/mime/audio.pyi
@@ -0,0 +1,5 @@
+from email.mime.nonmultipart import MIMENonMultipart
+
+
+class MIMEAudio(MIMENonMultipart):
+    def __init__(self, _audiodata, _subtype=..., _encoder=..., **_params) -> None: ...
diff --git a/stdlib/2/email/mime/base.pyi b/stdlib/2/email/mime/base.pyi
index 4eaabce66..4bde4f073 100644
--- a/stdlib/2/email/mime/base.pyi
+++ b/stdlib/2/email/mime/base.pyi
@@ -1,8 +1,4 @@
-# NOTE: This stub is incomplete.
+from email import message
 
-# import message
-
-# TODO
-# class MIMEBase(message.Message):
-class MIMEBase:
+class MIMEBase(message.Message):
     def __init__(self, _maintype, _subtype, **_params) -> None: ...
diff --git a/stdlib/2/email/mime/image.pyi b/stdlib/2/email/mime/image.pyi
new file mode 100644
index 000000000..2dfb098b8
--- /dev/null
+++ b/stdlib/2/email/mime/image.pyi
@@ -0,0 +1,5 @@
+from email.mime.nonmultipart import MIMENonMultipart
+
+
+class MIMEImage(MIMENonMultipart):
+    def __init__(self, _imagedata, _subtype=..., _encoder=..., **_params) -> None: ...
diff --git a/stdlib/2/email/mime/message.pyi b/stdlib/2/email/mime/message.pyi
new file mode 100644
index 000000000..33552faf2
--- /dev/null
+++ b/stdlib/2/email/mime/message.pyi
@@ -0,0 +1,5 @@
+from email.mime.nonmultipart import MIMENonMultipart
+
+
+class MIMEMessage(MIMENonMultipart):
+    def __init__(self, _msg, _subtype=...) -> None: ...
diff --git a/stdlib/2/email/parser.pyi b/stdlib/2/email/parser.pyi
new file mode 100644
index 000000000..5c80f1a53
--- /dev/null
+++ b/stdlib/2/email/parser.pyi
@@ -0,0 +1,8 @@
+class Parser:
+    def __init__(self, *args, **kws) -> None: ...
+    def parse(self, fp, headersonly: bool = ...): ...
+    def parsestr(self, text, headersonly: bool = ...): ...
+
+class HeaderParser(Parser):
+    def parse(self, fp, headersonly: bool = ...): ...
+    def parsestr(self, text, headersonly: bool = ...): ...
diff --git a/stdlib/2/email/quoprimime.pyi b/stdlib/2/email/quoprimime.pyi
new file mode 100644
index 000000000..3f2963c06
--- /dev/null
+++ b/stdlib/2/email/quoprimime.pyi
@@ -0,0 +1,18 @@
+def header_quopri_check(c): ...
+def body_quopri_check(c): ...
+def header_quopri_len(s): ...
+def body_quopri_len(str): ...
+def unquote(s): ...
+def quote(c): ...
+def header_encode(header, charset: str = ..., keep_eols: bool = ..., maxlinelen: int = ..., eol=...): ...
+def encode(body, binary: bool = ..., maxlinelen: int = ..., eol=...): ...
+
+body_encode = encode
+encodestring = encode
+
+def decode(encoded, eol=...): ...
+
+body_decode = decode
+decodestring = decode
+
+def header_decode(s): ...