add original message as parameter
Merge branch 'ipf-2.6' of https://github.com/oehf/ipf into ipf-2.6-bug39