I made backups before deleting of course.
I have just tried dragging and dropping the .eml files to the new storage folder and that seems to work fine.
I also note the system is downloading the 3gig of messages currently on the server so that should be most of them anyway.
thanks