From 5f21187f8458322e5be8ae3728cb4d9156eceff3 Mon Sep 17 00:00:00 2001
From: Cristian <cristianvargasvalencia@gmail.com>
Date: Thu, 26 Mar 2026 14:22:03 -0400
Subject: [PATCH 1/3] fix: Modal open bug

Signed-off-by: Cristian <cristianvargasvalencia@gmail.com>
---
 src/components/EnvelopeList.vue | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/components/EnvelopeList.vue b/src/components/EnvelopeList.vue
index 71ae845f7d..b440071d4f 100644
--- a/src/components/EnvelopeList.vue
+++ b/src/components/EnvelopeList.vue
@@ -113,13 +113,7 @@
 						{{ n('mail', 'Forward {number} as attachment', 'Forward {number} as attachment', selection.length, { number: selection.length }) }}
 					</ActionButton>
 				</Actions>
-				<MoveModal
-					v-if="showMoveModal"
-					:account="account"
-					:envelopes="selectedEnvelopes"
-					:move-thread="true"
-					@close="onCloseMoveModal" />
-			</div>
+				</div>
 		</transition>
 
 		<transition-group :name="listTransitionName">
@@ -154,6 +148,13 @@
 			:envelopes="selectedEnvelopes"
 			@close="onCloseTagModal" />
 
+		<MoveModal
+			v-if="showMoveModal"
+			:account="account"
+			:envelopes="selectedEnvelopes"
+			:move-thread="true"
+			@close="onCloseMoveModal" />
+
 		<NcDialog
 			v-if="showQuickActionsSettings"
 			:name="t('mail', 'Manage quick actions')"

From f7974f196973d383c3000876ec68cd8fe12e400b Mon Sep 17 00:00:00 2001
From: Cristian <cristianvargasvalencia@gmail.com>
Date: Thu, 26 Mar 2026 14:34:11 -0400
Subject: [PATCH 2/3] Fix: Important Icon not being imported

Signed-off-by: Cristian <cristianvargasvalencia@gmail.com>
---
 src/components/EnvelopeList.vue | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/components/EnvelopeList.vue b/src/components/EnvelopeList.vue
index b440071d4f..5438631317 100644
--- a/src/components/EnvelopeList.vue
+++ b/src/components/EnvelopeList.vue
@@ -173,6 +173,7 @@ import AlertOctagonIcon from 'vue-material-design-icons/AlertOctagonOutline.vue'
 import IconSelect from 'vue-material-design-icons/CloseThick.vue'
 import EmailRead from 'vue-material-design-icons/EmailOpenOutline.vue'
 import EmailUnread from 'vue-material-design-icons/EmailOutline.vue'
+import ImportantIcon from 'vue-material-design-icons/LabelVariant.vue'
 import ImportantOutlineIcon from 'vue-material-design-icons/LabelVariantOutline.vue'
 import OpenInNewIcon from 'vue-material-design-icons/OpenInNew.vue'
 import AddIcon from 'vue-material-design-icons/Plus.vue'
@@ -205,6 +206,7 @@ export default {
 		ActionButton,
 		Envelope,
 		IconDelete,
+		ImportantIcon,
 		ImportantOutlineIcon,
 		IconFavorite,
 		IconSelect,

From 2f2a4bbcf5127bdb924a51211a888a813fc7c0c4 Mon Sep 17 00:00:00 2001
From: Christoph Wurst <1374172+ChristophWurst@users.noreply.github.com>
Date: Thu, 7 May 2026 12:00:09 +0200
Subject: [PATCH 3/3] style: adjust cs for eslint

Signed-off-by: Christoph Wurst <1374172+ChristophWurst@users.noreply.github.com>
---
 src/components/EnvelopeList.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/EnvelopeList.vue b/src/components/EnvelopeList.vue
index 5438631317..d95701abe7 100644
--- a/src/components/EnvelopeList.vue
+++ b/src/components/EnvelopeList.vue
@@ -113,7 +113,7 @@
 						{{ n('mail', 'Forward {number} as attachment', 'Forward {number} as attachment', selection.length, { number: selection.length }) }}
 					</ActionButton>
 				</Actions>
-				</div>
+			</div>
 		</transition>
 
 		<transition-group :name="listTransitionName">