diff --git a/extensions/git/src/historyProvider.ts b/extensions/git/src/historyProvider.ts
index d13f85a5d46..c23a7c29f7d 100644
--- a/extensions/git/src/historyProvider.ts
+++ b/extensions/git/src/historyProvider.ts
@@ -127,15 +127,12 @@ export class GitHistoryProvider implements SourceControlHistoryProvider, FileDec
 			await ensureEmojis();
 
 			return commits.map(commit => {
-				const newLineIndex = commit.message.indexOf('\n');
-				const subject = newLineIndex !== -1 ? commit.message.substring(0, newLineIndex) : commit.message;
-
 				const labels = this.resolveHistoryItemLabels(commit);
 
 				return {
 					id: commit.hash,
 					parentIds: commit.parents,
-					message: emojify(subject),
+					message: emojify(commit.message),
 					author: commit.authorName,
 					icon: new ThemeIcon('git-commit'),
 					displayId: commit.hash.substring(0, 8),
diff --git a/src/vs/workbench/api/browser/mainThreadSCM.ts b/src/vs/workbench/api/browser/mainThreadSCM.ts
index 649cef3ce77..cc021cfa639 100644
--- a/src/vs/workbench/api/browser/mainThreadSCM.ts
+++ b/src/vs/workbench/api/browser/mainThreadSCM.ts
@@ -46,7 +46,11 @@ function toISCMHistoryItem(historyItemDto: SCMHistoryItemDto): ISCMHistoryItem {
 		title: l.title, icon: getIconFromIconDto(l.icon)
 	}));
 
-	return { ...historyItemDto, labels };
+	const newLineIndex = historyItemDto.message.indexOf('\n');
+	const subject = newLineIndex === -1 ?
+		historyItemDto.message : `${historyItemDto.message.substring(0, newLineIndex)}\u2026`;
+
+	return { ...historyItemDto, subject, labels };
 }
 
 class SCMInputBoxContentProvider extends Disposable implements ITextModelContentProvider {
diff --git a/src/vs/workbench/contrib/scm/browser/scmHistoryViewPane.ts b/src/vs/workbench/contrib/scm/browser/scmHistoryViewPane.ts
index d765da1afe3..73d33cddb0a 100644
--- a/src/vs/workbench/contrib/scm/browser/scmHistoryViewPane.ts
+++ b/src/vs/workbench/contrib/scm/browser/scmHistoryViewPane.ts
@@ -235,7 +235,7 @@ class HistoryItemRenderer implements ITreeRenderer<SCMHistoryItemViewModelTreeEl
 		const currentHistoryItemGroup = provider.historyProvider.get()?.currentHistoryItemGroup?.get();
 		const extraClasses = currentHistoryItemGroup?.revision === historyItem.id ? ['history-item-current'] : [];
 		const [matches, descriptionMatches] = this.processMatches(historyItemViewModel, node.filterData);
-		templateData.label.setLabel(historyItem.message, historyItem.author, { matches, descriptionMatches, extraClasses });
+		templateData.label.setLabel(historyItem.subject, historyItem.author, { matches, descriptionMatches, extraClasses });
 
 		templateData.labelContainer.textContent = '';
 		for (const label of historyItem.labels ?? []) {
@@ -408,6 +408,7 @@ class HistoryItemActionRunner extends ActionRunner {
 				{
 					id: h.historyItemViewModel.historyItem.id,
 					parentIds: h.historyItemViewModel.historyItem.parentIds,
+					subject: h.historyItemViewModel.historyItem.subject,
 					message: h.historyItemViewModel.historyItem.message,
 					displayId: h.historyItemViewModel.historyItem.displayId,
 					author: h.historyItemViewModel.historyItem.author,
@@ -418,6 +419,7 @@ class HistoryItemActionRunner extends ActionRunner {
 			args.push({
 				id: context.historyItemViewModel.historyItem.id,
 				parentIds: context.historyItemViewModel.historyItem.parentIds,
+				subject: context.historyItemViewModel.historyItem.subject,
 				message: context.historyItemViewModel.historyItem.message,
 				displayId: context.historyItemViewModel.historyItem.displayId,
 				author: context.historyItemViewModel.historyItem.author,
diff --git a/src/vs/workbench/contrib/scm/common/history.ts b/src/vs/workbench/contrib/scm/common/history.ts
index a6241dcc369..c1b260be184 100644
--- a/src/vs/workbench/contrib/scm/common/history.ts
+++ b/src/vs/workbench/contrib/scm/common/history.ts
@@ -52,6 +52,7 @@ export interface ISCMHistoryItemLabel {
 export interface ISCMHistoryItem {
 	readonly id: string;
 	readonly parentIds: string[];
+	readonly subject: string;
 	readonly message: string;
 	readonly displayId?: string;
 	readonly author?: string;
diff --git a/src/vs/workbench/contrib/scm/test/browser/scmHistory.test.ts b/src/vs/workbench/contrib/scm/test/browser/scmHistory.test.ts
index 6e8eaab90c8..9da7394ecd7 100644
--- a/src/vs/workbench/contrib/scm/test/browser/scmHistory.test.ts
+++ b/src/vs/workbench/contrib/scm/test/browser/scmHistory.test.ts
@@ -7,7 +7,11 @@ import * as assert from 'assert';
 import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
 import { ColorIdentifier } from '../../../../../platform/theme/common/colorUtils.js';
 import { colorRegistry, historyItemGroupBase, historyItemGroupLocal, historyItemGroupRemote, toISCMHistoryItemViewModelArray } from '../../browser/scmHistory.js';
-import { ISCMHistoryItem } from '../../common/history.js';
+import { ISCMHistoryItem, ISCMHistoryItemLabel } from '../../common/history.js';
+
+function toSCMHistoryItem(id: string, parentIds: string[], labels?: ISCMHistoryItemLabel[]): ISCMHistoryItem {
+	return { id, parentIds, subject: '', message: '', labels } satisfies ISCMHistoryItem;
+}
 
 suite('toISCMHistoryItemViewModelArray', () => {
 
@@ -26,8 +30,8 @@ suite('toISCMHistoryItemViewModelArray', () => {
 
 	test('single commit', () => {
 		const models = [
-			{ id: 'a', parentIds: [], message: '' },
-		] as ISCMHistoryItem[];
+			toSCMHistoryItem('a', []),
+		];
 
 		const viewModels = toISCMHistoryItemViewModelArray(models);
 
@@ -46,12 +50,12 @@ suite('toISCMHistoryItemViewModelArray', () => {
 	 */
 	test('linear graph', () => {
 		const models = [
-			{ id: 'a', parentIds: ['b'] },
-			{ id: 'b', parentIds: ['c'] },
-			{ id: 'c', parentIds: ['d'] },
-			{ id: 'd', parentIds: ['e'] },
-			{ id: 'e', parentIds: [] },
-		] as ISCMHistoryItem[];
+			toSCMHistoryItem('a', ['b']),
+			toSCMHistoryItem('b', ['c']),
+			toSCMHistoryItem('c', ['d']),
+			toSCMHistoryItem('d', ['e']),
+			toSCMHistoryItem('e', []),
+		];
 
 		const viewModels = toISCMHistoryItemViewModelArray(models);
 
@@ -110,12 +114,12 @@ suite('toISCMHistoryItemViewModelArray', () => {
 	 */
 	test('merge commit (single commit in topic branch)', () => {
 		const models = [
-			{ id: 'a', parentIds: ['b'] },
-			{ id: 'b', parentIds: ['c', 'd'] },
-			{ id: 'd', parentIds: ['c'] },
-			{ id: 'c', parentIds: ['e'] },
-			{ id: 'e', parentIds: ['f'] },
-		] as ISCMHistoryItem[];
+			toSCMHistoryItem('a', ['b']),
+			toSCMHistoryItem('b', ['c', 'd']),
+			toSCMHistoryItem('d', ['c']),
+			toSCMHistoryItem('c', ['e']),
+			toSCMHistoryItem('e', ['f']),
+		];
 
 		const viewModels = toISCMHistoryItemViewModelArray(models);
 
@@ -184,13 +188,13 @@ suite('toISCMHistoryItemViewModelArray', () => {
 	 */
 	test('merge commit (multiple commits in topic branch)', () => {
 		const models = [
-			{ id: 'a', parentIds: ['b', 'c'] },
-			{ id: 'c', parentIds: ['d'] },
-			{ id: 'b', parentIds: ['e'] },
-			{ id: 'e', parentIds: ['f'] },
-			{ id: 'f', parentIds: ['d'] },
-			{ id: 'd', parentIds: ['g'] },
-		] as ISCMHistoryItem[];
+			toSCMHistoryItem('a', ['b', 'c']),
+			toSCMHistoryItem('c', ['d']),
+			toSCMHistoryItem('b', ['e']),
+			toSCMHistoryItem('e', ['f']),
+			toSCMHistoryItem('f', ['d']),
+			toSCMHistoryItem('d', ['g']),
+		];
 
 		const viewModels = toISCMHistoryItemViewModelArray(models);
 
@@ -282,13 +286,13 @@ suite('toISCMHistoryItemViewModelArray', () => {
 	 */
 	test('create brach from merge commit', () => {
 		const models = [
-			{ id: 'a', parentIds: ['b', 'c'] },
-			{ id: 'c', parentIds: ['b'] },
-			{ id: 'b', parentIds: ['d', 'e'] },
-			{ id: 'e', parentIds: ['f'] },
-			{ id: 'f', parentIds: ['g'] },
-			{ id: 'd', parentIds: ['h'] },
-		] as ISCMHistoryItem[];
+			toSCMHistoryItem('a', ['b', 'c']),
+			toSCMHistoryItem('c', ['b']),
+			toSCMHistoryItem('b', ['d', 'e']),
+			toSCMHistoryItem('e', ['f']),
+			toSCMHistoryItem('f', ['g']),
+			toSCMHistoryItem('d', ['h']),
+		];
 
 		const viewModels = toISCMHistoryItemViewModelArray(models);
 
@@ -387,14 +391,14 @@ suite('toISCMHistoryItemViewModelArray', () => {
 	 */
 	test('create multiple branches from a commit', () => {
 		const models = [
-			{ id: 'a', parentIds: ['b', 'c'] },
-			{ id: 'c', parentIds: ['d'] },
-			{ id: 'b', parentIds: ['e', 'f'] },
-			{ id: 'f', parentIds: ['g'] },
-			{ id: 'e', parentIds: ['g'] },
-			{ id: 'd', parentIds: ['g'] },
-			{ id: 'g', parentIds: ['h'] },
-		] as ISCMHistoryItem[];
+			toSCMHistoryItem('a', ['b', 'c']),
+			toSCMHistoryItem('c', ['d']),
+			toSCMHistoryItem('b', ['e', 'f']),
+			toSCMHistoryItem('f', ['g']),
+			toSCMHistoryItem('e', ['g']),
+			toSCMHistoryItem('d', ['g']),
+			toSCMHistoryItem('g', ['h']),
+		] satisfies ISCMHistoryItem[];
 
 		const viewModels = toISCMHistoryItemViewModelArray(models);
 
@@ -513,13 +517,13 @@ suite('toISCMHistoryItemViewModelArray', () => {
 	 */
 	test('graph with color map', () => {
 		const models = [
-			{ id: 'a', parentIds: ['b'], labels: [{ title: 'topic' }] },
-			{ id: 'b', parentIds: ['c'] },
-			{ id: 'c', parentIds: ['d'], labels: [{ title: 'origin/topic' }] },
-			{ id: 'd', parentIds: ['e'] },
-			{ id: 'e', parentIds: ['f', 'g'] },
-			{ id: 'g', parentIds: ['h'], labels: [{ title: 'origin/main' }] }
-		] as ISCMHistoryItem[];
+			toSCMHistoryItem('a', ['b'], [{ title: 'topic' }]),
+			toSCMHistoryItem('b', ['c']),
+			toSCMHistoryItem('c', ['d'], [{ title: 'origin/topic' }]),
+			toSCMHistoryItem('d', ['e']),
+			toSCMHistoryItem('e', ['f', 'g']),
+			toSCMHistoryItem('g', ['h'], [{ title: 'origin/main' }])
+		];
 
 		const colorMap = new Map<string, ColorIdentifier>([
 			['topic', historyItemGroupLocal],