This obsoletes the first two patches of id:20170318030303.17344-1-david at tethera.net I think this is a more meaningful interpretation than matching all messages.