From ea01e402f79b90c0792771e03980abec73165781 Mon Sep 17 00:00:00 2001
From: Hamza <hamzamahjoubi221@gmail.com>
Date: Wed, 2 Jul 2025 17:49:50 +0200
Subject: [PATCH 1/2] fix: thread heading alignment and participants

Signed-off-by: Hamza <hamzamahjoubi221@gmail.com>
---
 src/components/MailboxThread.vue   |  2 +-
 src/components/Message.vue         |  3 +--
 src/components/MessageHTMLBody.vue |  3 +--
 src/components/Thread.vue          | 13 ++++++++++---
 4 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/components/MailboxThread.vue b/src/components/MailboxThread.vue
index 8382c823d0..81da5f8da0 100644
--- a/src/components/MailboxThread.vue
+++ b/src/components/MailboxThread.vue
@@ -106,7 +106,7 @@
 			</div>
 		</template>
 
-		<Thread v-if="showThread" @delete="deleteMessage" />
+		<Thread v-if="showThread" :current-account-email="account.emailAddress" @delete="deleteMessage" />
 		<NoMessageSelected v-else-if="hasEnvelopes" />
 	</AppContent>
 </template>
diff --git a/src/components/Message.vue b/src/components/Message.vue
index 5830f211cb..8557097023 100644
--- a/src/components/Message.vue
+++ b/src/components/Message.vue
@@ -180,7 +180,7 @@ export default {
 }
 
 .reply-buttons {
-	margin: 26px 30px 0 50px;
+	margin: 0 calc(var(--default-grid-baseline) * 2) 0 calc(var(--default-grid-baseline) * 14);
 	display: flex;
 	flex-wrap: wrap;
 	gap: 5px;
@@ -205,7 +205,6 @@ export default {
 
 	&__notsuggested {
 		margin-inline-start: auto;
-		margin-inline-end: -12px;
 	}
 }
 @media screen and (max-width: 600px) {
diff --git a/src/components/MessageHTMLBody.vue b/src/components/MessageHTMLBody.vue
index 19557dba35..12c93a2542 100644
--- a/src/components/MessageHTMLBody.vue
+++ b/src/components/MessageHTMLBody.vue
@@ -173,8 +173,7 @@ export default {
 <style lang="scss" scoped>
 // account for 8px margin on iframe body
 .html-message-body {
-	margin-inline-start: 50px;
-	margin-top: 2px;
+	margin : 2px calc(var(--default-grid-baseline) * 2) 0 calc(var(--default-grid-baseline) * 14);
 	background-color: #FFFFFF;
 }
 
diff --git a/src/components/Thread.vue b/src/components/Thread.vue
index 985d1bf76e..c668f82bfc 100644
--- a/src/components/Thread.vue
+++ b/src/components/Thread.vue
@@ -93,6 +93,12 @@ export default {
 		ThreadEnvelope,
 		Popover,
 	},
+	props: {
+		currentAccountEmail: {
+			type: String,
+			required: true,
+		},
+	},
 
 	data() {
 		return {
@@ -165,7 +171,7 @@ export default {
 		threadParticipants() {
 			const recipients = this.thread.flatMap(envelope => {
 				return envelope.from.concat(envelope.to).concat(envelope.cc)
-			})
+			}).filter(participant => participant.email !== this.currentAccountEmail)
 			return uniqBy(prop('email'), recipients)
 		},
 		threadSubject() {
@@ -599,7 +605,8 @@ export default {
 	// initial width
 	width: 0;
 	// while scrolling, the back button overlaps with subject on small screen
-	padding-inline-start: calc(var(--border-radius-container-large) + var(--header-height));
+	// 66px to allign with the sender Envelope -> 8px margin + 2px border+ avatar -> 40px width  + envelope__header -> 8px padding + sender-> margin 8px
+	padding-left: 66px;
 	// grow and try to fill 100%
 	flex: 1 1 auto;
 	h2,
@@ -639,7 +646,7 @@ export default {
 }
 
 #mail-content {
-	margin: calc(var(--default-grid-baseline) * 2) calc(var(--default-grid-baseline) * 10) 0 calc(var(--default-grid-baseline) * 15);
+	margin: calc(var(--default-grid-baseline) * 2) calc(var(--default-grid-baseline) * 10) 0 calc(var(--default-grid-baseline) * 14);
 }
 
 #mail-content iframe {

From 989f540d22e398bce6b58c467bda93932b5f06db Mon Sep 17 00:00:00 2001
From: Hamza <hamzamahjoubi221@gmail.com>
Date: Wed, 2 Jul 2025 17:24:08 +0200
Subject: [PATCH 2/2] fix: reply buttons spacing

Signed-off-by: Hamza <hamzamahjoubi221@gmail.com>
---
 src/components/Message.vue | 2 +-
 src/components/Thread.vue  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/Message.vue b/src/components/Message.vue
index 8557097023..6dfcf1d8df 100644
--- a/src/components/Message.vue
+++ b/src/components/Message.vue
@@ -180,7 +180,7 @@ export default {
 }
 
 .reply-buttons {
-	margin: 0 calc(var(--default-grid-baseline) * 2) 0 calc(var(--default-grid-baseline) * 14);
+	margin: 0 calc(var(--default-grid-baseline) * 4) calc(var(--default-grid-baseline) * 2) calc(var(--default-grid-baseline) * 14);
 	display: flex;
 	flex-wrap: wrap;
 	gap: 5px;
diff --git a/src/components/Thread.vue b/src/components/Thread.vue
index c668f82bfc..f4b1a21c78 100644
--- a/src/components/Thread.vue
+++ b/src/components/Thread.vue
@@ -564,7 +564,7 @@ export default {
 
 .mail-message-body {
 	flex: 1;
-	margin-bottom: calc(var(--default-grid-baseline) * 7);
+	margin-bottom: calc(var(--default-grid-baseline) * 2);
 	position: relative;
 }
 
@@ -606,7 +606,7 @@ export default {
 	width: 0;
 	// while scrolling, the back button overlaps with subject on small screen
 	// 66px to allign with the sender Envelope -> 8px margin + 2px border+ avatar -> 40px width  + envelope__header -> 8px padding + sender-> margin 8px
-	padding-left: 66px;
+	padding-inline-start: 66px;
 	// grow and try to fill 100%
 	flex: 1 1 auto;
 	h2,