[DO NOT MERGE] Follow modifications done to imap-codec for Aerogramme #417
+419
−54
We went looking everywhere, but couldn’t find those commits.
Sometimes commits can disappear after a force-push. Head back to the latest changes here.