Merge "If subject is shortened for displaying in the UI indicate this by '...'"