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