Added move and delete option to message + expunge function