fix message cut off on delayed msg delivery
Merge branch 'fix_delayed_msg'