I'd move os.remove into the message class, that way all the file manipulation is in one place