Improve imapfilter rules