proper upload and message editing