Fixed up message partial