[master][3.0.7] Restore messages from Trash is not possible #2566
Merge pull request #2652 from 810/3.0.7-fix-1

[master][3.0.7] Restore messages from Trash is not possible #2566