Merge branch 'jn/mailinfo-scissors' * jn/mailinfo-scissors: Teach mailinfo %< as an alternative scissors mark