diff --git a/src/components/Envelope.vue b/src/components/Envelope.vue
index 29f0556211..51181be60d 100644
--- a/src/components/Envelope.vue
+++ b/src/components/Envelope.vue
@@ -173,8 +173,12 @@
 				<div
 					v-if="!compactMode && (data.encrypted || data.previewText)"
 					class="envelope__preview-text"
-					:title="data.summary ? t('mail', 'This summary was AI generated') : null">
-					<NcAssistantIcon v-if="data.summary" :size="15" class="envelope__preview-text__icon" />
+					:title="data.summary ? data.summary.trim() : null">
+					<NcAssistantIcon
+						v-if="data.summary"
+						:size="15"
+						class="envelope__preview-text__icon"
+						:title="t('mail', 'This summary was AI-generated')" />
 					{{ isEncrypted ? t('mail', 'Encrypted message') : data.summary ? data.summary.trim() : data.previewText.trim() }}
 				</div>
 			</div>
diff --git a/src/components/ThreadSummary.vue b/src/components/ThreadSummary.vue
index bfa0b6c7aa..4d83f1f4fe 100644
--- a/src/components/ThreadSummary.vue
+++ b/src/components/ThreadSummary.vue
@@ -37,7 +37,7 @@
 				</p>
 			</div>
 			<div class="summary__notice">
-				{{ t('mail', 'This summary is AI generated and may contain mistakes.') }}
+				{{ t('mail', 'This summary is AI-generated and may contain mistakes.') }}
 			</div>
 		</div>
 	</NcAssistantContent>