Merge "MAP: move moveMessageToFolder to BT Utils"