Apparently X-OIM-Proxy was not a good way to decide that we received a multi-part message. Now always just split if a boundary is available from the content-type. Try and match the telephone number before the using the address from the From line. Fixes #7901.