Added option to not auto receipt messages