Added move and delete function to message + expunge function