Fixed issue: Fixed message links