Rebase our patches on top of Icedove 24

Original created by @intrigeri on 6367 (Redmine)

To upload designs, you'll need to enable LFS and have an admin enable hashed storage. More information