LPS-52188 use folderId when moving messages
my local changes