message improvements, allow different content