ratio extra care
Merge remote-tracking branch 'origin/fix' into fix
pleas test on whether it works for reset socked every time the reply view shows up