Return proper message ids on reject notices. Possible resolution to #35