change FixMessageImp form list to map