Adds multi-part email support as implemented in jlsync/pickle@c0f15e84