> The patch to imap/Makefile is Homebrew-specific

Please do it anyway. We want all patches to end up upstream eventually. Those that are rejected upstream should be removed or replaced with `inreplace` calls instead.