diff --git a/Cargo.lock b/Cargo.lock
index 694832f8e..fd90c3d53 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -612,6 +612,7 @@ dependencies = [
  "authentication",
  "aws-config",
  "aws-sdk-s3",
+ "base64 0.22.1",
  "brotli 3.5.0",
  "byteorder",
  "bytes",
@@ -648,6 +649,7 @@ dependencies = [
  "lettre",
  "log",
  "mailer",
+ "md5",
  "mime",
  "once_cell",
  "opener",
@@ -2088,6 +2090,7 @@ dependencies = [
  "app-error",
  "arc-swap",
  "async-trait",
+ "base64 0.22.1",
  "bincode",
  "brotli 3.5.0",
  "bytes",
@@ -2104,6 +2107,7 @@ dependencies = [
  "gotrue",
  "infra",
  "lazy_static",
+ "md5",
  "mime",
  "mime_guess",
  "parking_lot 0.12.3",
@@ -2231,7 +2235,7 @@ dependencies = [
 [[package]]
 name = "collab"
 version = "0.2.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=cabf08194dff2b764ca0c7c63a2c1bdd5d02e45c#cabf08194dff2b764ca0c7c63a2c1bdd5d02e45c"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=7a47ee71a5d101cc467c37b0df72215549fc2c02#7a47ee71a5d101cc467c37b0df72215549fc2c02"
 dependencies = [
  "anyhow",
  "arc-swap",
@@ -2256,7 +2260,7 @@ dependencies = [
 [[package]]
 name = "collab-database"
 version = "0.2.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=cabf08194dff2b764ca0c7c63a2c1bdd5d02e45c#cabf08194dff2b764ca0c7c63a2c1bdd5d02e45c"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=7a47ee71a5d101cc467c37b0df72215549fc2c02#7a47ee71a5d101cc467c37b0df72215549fc2c02"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -2295,7 +2299,7 @@ dependencies = [
 [[package]]
 name = "collab-document"
 version = "0.2.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=cabf08194dff2b764ca0c7c63a2c1bdd5d02e45c#cabf08194dff2b764ca0c7c63a2c1bdd5d02e45c"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=7a47ee71a5d101cc467c37b0df72215549fc2c02#7a47ee71a5d101cc467c37b0df72215549fc2c02"
 dependencies = [
  "anyhow",
  "arc-swap",
@@ -2316,7 +2320,7 @@ dependencies = [
 [[package]]
 name = "collab-entity"
 version = "0.2.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=cabf08194dff2b764ca0c7c63a2c1bdd5d02e45c#cabf08194dff2b764ca0c7c63a2c1bdd5d02e45c"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=7a47ee71a5d101cc467c37b0df72215549fc2c02#7a47ee71a5d101cc467c37b0df72215549fc2c02"
 dependencies = [
  "anyhow",
  "bytes",
@@ -2336,7 +2340,7 @@ dependencies = [
 [[package]]
 name = "collab-folder"
 version = "0.2.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=cabf08194dff2b764ca0c7c63a2c1bdd5d02e45c#cabf08194dff2b764ca0c7c63a2c1bdd5d02e45c"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=7a47ee71a5d101cc467c37b0df72215549fc2c02#7a47ee71a5d101cc467c37b0df72215549fc2c02"
 dependencies = [
  "anyhow",
  "arc-swap",
@@ -2358,7 +2362,7 @@ dependencies = [
 [[package]]
 name = "collab-importer"
 version = "0.1.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=cabf08194dff2b764ca0c7c63a2c1bdd5d02e45c#cabf08194dff2b764ca0c7c63a2c1bdd5d02e45c"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=7a47ee71a5d101cc467c37b0df72215549fc2c02#7a47ee71a5d101cc467c37b0df72215549fc2c02"
 dependencies = [
  "anyhow",
  "async-recursion",
@@ -2459,7 +2463,7 @@ dependencies = [
 [[package]]
 name = "collab-user"
 version = "0.2.0"
-source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=cabf08194dff2b764ca0c7c63a2c1bdd5d02e45c#cabf08194dff2b764ca0c7c63a2c1bdd5d02e45c"
+source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=7a47ee71a5d101cc467c37b0df72215549fc2c02#7a47ee71a5d101cc467c37b0df72215549fc2c02"
 dependencies = [
  "anyhow",
  "collab",
diff --git a/Cargo.toml b/Cargo.toml
index 37f9fe9ae..1233f7e85 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -153,6 +153,9 @@ async_zip.workspace = true
 sanitize-filename.workspace = true
 futures-lite = "2.3.0"
 
+base64.workspace = true
+md5.workspace = true
+
 
 [dev-dependencies]
 once_cell = "1.19.0"
@@ -276,6 +279,8 @@ pgvector = { version = "0.4", features = ["sqlx"] }
 client-api-entity = { path = "libs/client-api-entity" }
 async_zip = { version = "0.0.17", features = ["full"] }
 sanitize-filename = "0.5.0"
+base64 = "0.22"
+md5 = "0.7.0"
 
 # collaboration
 yrs = { version = "0.21.2", features = ["sync"] }
@@ -299,13 +304,13 @@ debug = true
 [patch.crates-io]
 # It's diffcult to resovle different version with the same crate used in AppFlowy Frontend and the Client-API crate.
 # So using patch to workaround this issue.
-collab = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "cabf08194dff2b764ca0c7c63a2c1bdd5d02e45c" }
-collab-entity = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "cabf08194dff2b764ca0c7c63a2c1bdd5d02e45c" }
-collab-folder = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "cabf08194dff2b764ca0c7c63a2c1bdd5d02e45c" }
-collab-document = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "cabf08194dff2b764ca0c7c63a2c1bdd5d02e45c" }
-collab-user = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "cabf08194dff2b764ca0c7c63a2c1bdd5d02e45c" }
-collab-database = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "cabf08194dff2b764ca0c7c63a2c1bdd5d02e45c" }
-collab-importer = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "cabf08194dff2b764ca0c7c63a2c1bdd5d02e45c" }
+collab = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "7a47ee71a5d101cc467c37b0df72215549fc2c02" }
+collab-entity = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "7a47ee71a5d101cc467c37b0df72215549fc2c02" }
+collab-folder = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "7a47ee71a5d101cc467c37b0df72215549fc2c02" }
+collab-document = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "7a47ee71a5d101cc467c37b0df72215549fc2c02" }
+collab-user = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "7a47ee71a5d101cc467c37b0df72215549fc2c02" }
+collab-database = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "7a47ee71a5d101cc467c37b0df72215549fc2c02" }
+collab-importer = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "7a47ee71a5d101cc467c37b0df72215549fc2c02" }
 
 [features]
 history = []
diff --git a/assets/mailer_templates/build_production/images/appflowy.png b/assets/mailer_templates/build_production/images/appflowy.png
new file mode 100644
index 000000000..c69a72c27
Binary files /dev/null and b/assets/mailer_templates/build_production/images/appflowy.png differ
diff --git a/assets/mailer_templates/build_production/import_data_fail.html b/assets/mailer_templates/build_production/import_data_fail.html
index 625aa265c..60521a08e 100644
--- a/assets/mailer_templates/build_production/import_data_fail.html
+++ b/assets/mailer_templates/build_production/import_data_fail.html
@@ -21,6 +21,16 @@
   <![endif]-->
   <title>Workspace Import Failed</title>
   <style>
+    .p-4 {
+      padding: 16px
+    }
+    .py-4 {
+      padding-top: 16px;
+      padding-bottom: 16px
+    }
+    .text-white {
+      color: #fff
+    }
     @media (max-width: 600px) {
       .sm-px-4 {
         padding-left: 16px !important;
@@ -42,12 +52,19 @@
     <div class="sm-px-4 sm-py-12" style="background-color: #faf5ff; padding: 96px 48px; font-family: Helvetica, ui-sans-serif, system-ui, -apple-system, 'Segoe UI', sans-serif; color: #000">
       <table align="center" cellpadding="0" cellspacing="0" role="none">
         <tr>
-          <td style="width: 552px; max-width: 100%">
-            <p style="width: 100%; white-space: normal; overflow-wrap: break-word; text-align: center; font-size: 18px; color: #dc2626">
-              <span>Failed to import your notion file {{ import_file_name }}</span>
-              <br>
-              <span style="margin-left: 8px; margin-right: 8px">{{ error }}</span>
+          <td style="width: 622px; max-width: 100%; text-align: center">
+            <p style="width: 100%; white-space: normal; overflow-wrap: break-word; text-align: center; font-size: 24px">
+              <span style="font-size: 30px; font-weight: 700">Notion Import Failed</span>
             </p>
+            <p style="width: 100%; white-space: normal; overflow-wrap: break-word; text-align: center; font-size: 24px;">
+              <span style="color: #fb006d">{{ error }}</span>
+            </p>
+            <div style="margin-left: auto; margin-right: auto; width: 70%; text-align: center; font-size: 14px; line-height: 18px; color: #64748b">
+              Join our Discord <a href="https://discord.gg/9Q2xaN37tV" style="color: #9327ff">server</a> to get quick help
+              or <a href="https://github.com/AppFlowy-IO/AppFlowy/issues/new/choose" style="color: #9327ff;">
+                report</a> the issue on GitHub
+            </div>
+            <div role="separator" style="background-color: #cbd5e1; height: 1px; line-height: 1px; margin: 24px 20%">&zwj;</div>
           </td>
         </tr>
         <tr>
@@ -57,20 +74,27 @@
                 <img src="https://raw.githubusercontent.com/AppFlowy-IO/AppFlowy-Cloud/main/assets/mailer_templates/build_production/images/appflowy-logo.png" width="150px" style="max-width: 100%; vertical-align: middle; line-height: 1" alt="">
               </a>
             </p>
+            <p style="margin: 0; font-size: 14px; font-weight: 500; color: #000">
+              Bring projects, knowledge, and teams together with the power of AI.
+            </p>
+            <p style="cursor: default">
+              <a href="https://twitter.com/appflowy" style="margin-right: 16px; color: #4338ca; text-decoration: none">
+                <img src="https://raw.githubusercontent.com/AppFlowy-IO/AppFlowy-Cloud/main/assets/mailer_templates/build_production/images/twitter.png" width="20" alt="Maizzle" style="max-width: 100%; vertical-align: middle; line-height: 1;">
+              </a>
+              <a href="https://www.reddit.com/r/AppFlowy" style="margin-right: 16px; color: #4338ca; text-decoration: none;">
+                <img src="https://raw.githubusercontent.com/AppFlowy-IO/AppFlowy-Cloud/main/assets/mailer_templates/build_production/images/reddit.png" width="20" alt="Maizzle" style="max-width: 100%; vertical-align: middle; line-height: 1;">
+              </a>
+              <a href="https://github.com/AppFlowy-IO/AppFlowy" style="margin-right: 16px; color: #4338ca; text-decoration: none;">
+                <img src="https://raw.githubusercontent.com/AppFlowy-IO/AppFlowy-Cloud/main/assets/mailer_templates/build_production/images/github.png" width="20" alt="Maizzle" style="max-width: 100%; vertical-align: middle; line-height: 1;">
+              </a>
+              <a href="https://discord.gg/9Q2xaN37tV" style="margin-right: 16px; color: #4338ca; text-decoration: none;">
+                <img src="https://raw.githubusercontent.com/AppFlowy-IO/AppFlowy-Cloud/main/assets/mailer_templates/build_production/images/discord.png" width="20" alt="Maizzle" style="max-width: 100%; vertical-align: middle; line-height: 1;">
+              </a>
+            </p>
           </td>
         </tr>
       </table>
     </div>
   </div>
 </body>
-</html>
-<script>
-  document
-    .getElementById("copyErrorDetails")
-    .addEventListener("click", function() {
-      const errorDetails = document.getElementById("errorDetails");
-      errorDetails.select();
-      document.execCommand("copy");
-      alert("Error details copied to clipboard!");
-    });
-</script>
\ No newline at end of file
+</html>
\ No newline at end of file
diff --git a/assets/mailer_templates/build_production/import_data_success.html b/assets/mailer_templates/build_production/import_data_success.html
index b7435bbc2..c1d8deabd 100644
--- a/assets/mailer_templates/build_production/import_data_success.html
+++ b/assets/mailer_templates/build_production/import_data_success.html
@@ -21,6 +21,9 @@
   <![endif]-->
   <title>Workspace Import Success</title>
   <style>
+    .hover-opacity-90:hover {
+      opacity: 0.9 !important
+    }
     @media (max-width: 600px) {
       .sm-px-4 {
         padding-left: 16px !important;
@@ -42,24 +45,72 @@
     <div class="sm-px-4 sm-py-12" style="background-color: #faf5ff; padding: 96px 48px; font-family: Helvetica, ui-sans-serif, system-ui, -apple-system, 'Segoe UI', sans-serif; color: #000">
       <table align="center" cellpadding="0" cellspacing="0" role="none">
         <tr>
-          <td style="width: 552px; max-width: 100%">
-            <p style="width: 100%; white-space: normal; overflow-wrap: break-word; text-align: center; font-size: 18px">
-              <span style="margin-left: 8px; margin-right: 8px">
-                            Your Notion files has been successfully imported. Please open AppFlowy and switch to the new workspace
-                        </span>
-              <br>
-              <span style="font-size: 24px; font-weight: 700">
-              {{ workspace_name }}
-              </span>
+          <td style="width: 582px; max-width: 100%">
+            <p style="width: 100%; white-space: normal; overflow-wrap: break-word; text-align: center; font-size: 24px">
+              <span style="font-size: 30px; font-weight: 700">Notion Import Complete</span>
+            </p>
+            <p style="width: 100%; white-space: normal; overflow-wrap: break-word; text-align: center; font-size: 24px;">
+              <span>Your Notion data has been successfully imported into</span>
+            </p>
+            <p style="width: 100%; white-space: normal; overflow-wrap: break-word; text-align: center; font-size: 24px;">
+              <span style="font-size: 30px; font-weight: 700;">{{ workspace_name }}</span>
             </p>
             <div role="separator" style="background-color: #cbd5e1; height: 1px; line-height: 1px; margin: 24px 20%">&zwj;</div>
+            <table align="center" cellpadding="0" cellspacing="0" role="none">
+              <tr>
+                <td style="width: 60px">
+                  <div style="margin-right: 8px; height: 60px; width: 60px; overflow: hidden; border-radius: 16px; background-color: #fff; padding: 8px; border: 2px solid black">
+                    <img src="https://raw.githubusercontent.com/AppFlowy-IO/AppFlowy-Cloud/main/assets/mailer_templates/build_production/images/appflowy.png" width="100%" height="100%" alt="{{ workspace_name }}" style="max-width: 100%; vertical-align: middle; line-height: 1; overflow: hidden; object-fit: cover">
+                  </div>
+                </td>
+                <td>
+                  <div style="margin-bottom: 8px; font-weight: 700">
+                    {{ workspace_name }}
+                  </div>
+                  <div style="font-size: 14px; color: #64748b"> 1 member</div>
+                </td>
+              </tr>
+            </table>
+            <div style="text-align: center;">
+              <a href="https://appflowy.io/download" class="hover-opacity-90" target="_blank" style="margin-top: 32px; margin-bottom: 32px; display: inline-block; width: 60%; cursor: pointer; border-radius: 16px; padding: 16px 24px; color: #f8fafc; text-decoration: none; background-color: #9327ff; font-size: 20px; font-weight: 400; line-height: 20px">
+                <!--[if mso]>
+      <i style="mso-font-width: 150%; mso-text-raise: 30px" hidden>&emsp;</i>
+    <![endif]-->
+                <span style="mso-text-raise: 16px">
+            <div style="font-size: 24px; font-weight: 500">
+              Download
+            </div>
+          </span>
+                <!--[if mso]>
+      <i hidden style="mso-font-width: 150%;">&emsp;&#8203;</i>
+    <![endif]-->
+              </a>
+            </div>
+            <div role="separator" style="background-color: #cbd5e1; height: 1px; line-height: 1px; margin: 24px 20%;">&zwj;</div>
           </td>
         </tr>
         <tr>
           <td style="padding-left: 24px; padding-right: 24px; text-align: center; font-size: 12px; color: #475569">
             <p style="margin: 0 0 16px; cursor: pointer; text-transform: uppercase">
               <a href="https://appflowy.io">
-                <img src="https://raw.githubusercontent.com/AppFlowy-IO/AppFlowy-Cloud/main/assets/mailer_templates/build_production/images/appflowy-logo.png" width="150px" style="max-width: 100%; vertical-align: middle; line-height: 1" alt="">
+                <img src="https://raw.githubusercontent.com/AppFlowy-IO/AppFlowy-Cloud/main/assets/mailer_templates/build_production/images/appflowy-logo.png" width="150px" style="max-width: 100%; vertical-align: middle; line-height: 1;" alt="">
+              </a>
+            </p>
+            <p style="margin: 0; font-size: 14px; font-weight: 500; color: #000;">
+              Bring projects, knowledge, and teams together with the power of AI.
+            </p>
+            <p style="cursor: default">
+              <a href="https://twitter.com/appflowy" style="margin-right: 16px; color: #4338ca; text-decoration: none">
+                <img src="https://raw.githubusercontent.com/AppFlowy-IO/AppFlowy-Cloud/main/assets/mailer_templates/build_production/images/twitter.png" width="20" alt="Maizzle" style="max-width: 100%; vertical-align: middle; line-height: 1;">
+              </a>
+              <a href="https://www.reddit.com/r/AppFlowy" style="margin-right: 16px; color: #4338ca; text-decoration: none;">
+                <img src="https://raw.githubusercontent.com/AppFlowy-IO/AppFlowy-Cloud/main/assets/mailer_templates/build_production/images/reddit.png" width="20" alt="Maizzle" style="max-width: 100%; vertical-align: middle; line-height: 1;">
+              </a>
+              <a href="https://github.com/AppFlowy-IO/AppFlowy" style="margin-right: 16px; color: #4338ca; text-decoration: none;">
+                <img src="https://raw.githubusercontent.com/AppFlowy-IO/AppFlowy-Cloud/main/assets/mailer_templates/build_production/images/github.png" width="20" alt="Maizzle" style="max-width: 100%; vertical-align: middle; line-height: 1;">
+              </a>
+              <a href="https://discord.gg/9Q2xaN37tV" style="margin-right: 16px; color: #4338ca; text-decoration: none;">
+                <img src="https://raw.githubusercontent.com/AppFlowy-IO/AppFlowy-Cloud/main/assets/mailer_templates/build_production/images/discord.png" width="20" alt="Maizzle" style="max-width: 100%; vertical-align: middle; line-height: 1;">
               </a>
             </p>
           </td>
diff --git a/email_template/src/images/appflowy.png b/email_template/src/images/appflowy.png
new file mode 100644
index 000000000..c69a72c27
Binary files /dev/null and b/email_template/src/images/appflowy.png differ
diff --git a/email_template/src/templates/import_data_fail.html b/email_template/src/templates/import_data_fail.html
index a079921a6..447628bf9 100644
--- a/email_template/src/templates/import_data_fail.html
+++ b/email_template/src/templates/import_data_fail.html
@@ -5,46 +5,60 @@
 ---
 
 <x-main>
-    <div
-            class="bg-purple-50 font-helvetica sm:px-4 px-12 sm:py-12 py-24 text-black"
-    >
-        <table align="center">
-            <tr>
-                <td class="w-[552px] max-w-full">
-                    <!-- Display Error Message -->
-                    <p
-                            class="w-full text-center break-words whitespace-normal text-lg text-red-600"
-                    >
-                        <span class=class="mx-2">Failed to import your notion file {{ importFileName }}</span>
-                        <br>
-                        <span class="mx-2">{{ error }}</span>
-                    </p>
-                </td>
-            </tr>
-            <tr>
-                <td class="text-center text-slate-600 text-xs px-6">
-                    <p class="m-0 mb-4 uppercase cursor-pointer">
-                        <a href="https://appflowy.io">
-                            <img
-                                    src="{{ cdnBaseUrl }}images/appflowy-logo.png"
-                                    width="150px"
-                            />
-                        </a>
-                    </p>
-                </td>
-            </tr>
-        </table>
-    </div>
+  <div class="bg-purple-50 font-helvetica sm:px-4 px-12 sm:py-12 py-24 text-black">
+    <table align="center">
+      <tr>
+        <td class="w-[622px] max-w-full text-center">
+          <p class="w-full text-center break-words whitespace-normal text-2xl">
+            <span class="text-3xl font-bold">Notion Import Failed</span>
+
+          </p>
+
+          <p class="w-full text-center break-words whitespace-normal text-2xl">
+            <span class="mx-2=1 text-[#fb006d]">{{ error }}</span>
+          </p>
+
+          <div class="mx-auto  leading-4.5 text-sm text-slate-500 text-center w-[70%]">
+            Join our Discord <a href="https://discord.gg/9Q2xaN37tV" class="text-[#9327ff]">server</a> to get quick help
+            or <a href="https://github.com/AppFlowy-IO/AppFlowy/issues/new/choose" class="text-[#9327ff]">
+            report</a> the issue on GitHub
+          </div>
+
+          <x-divider space-x="20%"/>
+        </td>
+      </tr>
+      <tr>
+        <td class="text-center text-slate-600 text-xs px-6">
+          <p class="m-0 mb-4 uppercase cursor-pointer">
+            <a href="https://appflowy.io">
+              <img src="{{ cdnBaseUrl }}images/appflowy-logo.png" width="150px">
+            </a>
+          </p>
+          <p class="m-0 text-sm text-black font-medium">
+            Bring projects, knowledge, and teams together with the power of AI.
+          </p>
+
+          <p class="cursor-default">
+            <a href="https://twitter.com/appflowy"
+               class="text-indigo-700 [text-decoration:none] mr-4">
+              <img src="{{ cdnBaseUrl }}images/twitter.png" width="20" alt="Maizzle">
+            </a>
+            <a href="https://www.reddit.com/r/AppFlowy"
+               class="text-indigo-700 [text-decoration:none] mr-4">
+              <img src="{{ cdnBaseUrl }}images/reddit.png" width="20" alt="Maizzle">
+            </a>
+            <a href="https://github.com/AppFlowy-IO/AppFlowy"
+               class="text-indigo-700 [text-decoration:none] mr-4">
+              <img src="{{ cdnBaseUrl }}images/github.png" width="20" alt="Maizzle">
+            </a>
+            <a href="https://discord.gg/9Q2xaN37tV"
+               class="text-indigo-700 [text-decoration:none] mr-4">
+              <img src="{{ cdnBaseUrl }}images/discord.png" width="20" alt="Maizzle">
+            </a>
+          </p>
+        </td>
+      </tr>
+    </table>
+  </div>
 </x-main>
 
-<!-- JavaScript to handle copying error details to clipboard -->
-<script>
-  document
-      .getElementById("copyErrorDetails")
-      .addEventListener("click", function () {
-        const errorDetails = document.getElementById("errorDetails");
-        errorDetails.select();
-        document.execCommand("copy");
-        alert("Error details copied to clipboard!");
-      });
-</script>
diff --git a/email_template/src/templates/import_data_success.html b/email_template/src/templates/import_data_success.html
index 256091bc0..b0a64db7c 100644
--- a/email_template/src/templates/import_data_success.html
+++ b/email_template/src/templates/import_data_success.html
@@ -5,35 +5,87 @@
 ---
 
 <x-main>
-    <div
-            class="bg-purple-50 font-helvetica sm:px-4 px-12 sm:py-12 py-24 text-black"
-    >
-        <table align="center">
-            <tr>
-                <td class="w-[552px] max-w-full">
-                    <!-- Display Success Message -->
-                    <p class="w-full text-center break-words whitespace-normal text-lg">
-                        <span class="mx-2">
-                            Your Notion files has been successfully imported. Please open AppFlowy and switch to the new workspace
-                        </span>
-                        <br>
-                        <span class="text-2xl font-bold">
-                            {{ workspaceName }}
-                        </span>
-                    </p>
-                    <x-divider space-x="20%" />
-                </td>
-            </tr>
+  <div class="bg-purple-50 font-helvetica sm:px-4 px-12 sm:py-12 py-24 text-black">
+    <table align="center">
+      <tr>
+        <td class="w-[582px] max-w-full">
+          <p class="w-full text-center break-words whitespace-normal text-2xl">
+            <span class="text-3xl font-bold">Notion Import Complete</span>
+
+          </p>
+
+          <p class="w-full text-center break-words whitespace-normal text-2xl">
+            <span class="mx-2=1">Your Notion data has been successfully imported into</span>
+          </p>
+          <p class="w-full text-center break-words whitespace-normal text-2xl">
+            <span class="text-3xl font-bold">{{ workspaceName }}</span>
+          </p>
+          <x-divider space-x="20%"/>
+          <table align="center">
             <tr>
-                <td class="text-center text-slate-600 text-xs px-6">
-                    <p class="m-0 mb-4 uppercase cursor-pointer">
-                        <a href="https://appflowy.io">
-                            <img
-                                    src="{{ cdnBaseUrl }}images/appflowy-logo.png"
-                                    width="150px"
-                            />
-                        </a>
-                    </p>
-                </td>
+              <td class="w-[60px]">
+                <div
+                  style="border: 2px solid black;"
+                  class="rounded-2xl mr-2 w-[60px] p-2 h-[60px] bg-white overflow-hidden">
+                  <img src="{{ cdnBaseUrl }}images/appflowy.png"
+                       class="overflow-hidden object-cover"
+                       width="100%" height="100%"
+                       alt="{{ workspaceName }}">
+                </div>
+
+              </td>
+              <td>
+                <div class="font-bold mb-2">
+                  {{ workspaceName }}
+                </div>
+                <div class="text-sm text-slate-500"> 1 member</div>
+
+              </td>
             </tr>
+          </table>
+          <x-button align="center"
+                    target="_blank"
+                    class="hover:opacity-90 cursor-pointer !text-xl !leading-[20px] !bg-[#9327ff] !font-normal w-[60%] my-8 rounded-2xl"
+                    href="https://appflowy.io/download">
+
+            <div class="font-medium text-[24px]">
+              Download
+            </div>
+          </x-button>
+          <x-divider space-x="20%"/>
+        </td>
+      </tr>
+      <tr>
+        <td class="text-center text-slate-600 text-xs px-6">
+          <p class="m-0 mb-4 uppercase cursor-pointer">
+            <a href="https://appflowy.io">
+              <img src="{{ cdnBaseUrl }}images/appflowy-logo.png" width="150px">
+            </a>
+          </p>
+          <p class="m-0 text-sm text-black font-medium">
+            Bring projects, knowledge, and teams together with the power of AI.
+          </p>
 
+          <p class="cursor-default">
+            <a href="https://twitter.com/appflowy"
+               class="text-indigo-700 [text-decoration:none] mr-4">
+              <img src="{{ cdnBaseUrl }}images/twitter.png" width="20" alt="Maizzle">
+            </a>
+            <a href="https://www.reddit.com/r/AppFlowy"
+               class="text-indigo-700 [text-decoration:none] mr-4">
+              <img src="{{ cdnBaseUrl }}images/reddit.png" width="20" alt="Maizzle">
+            </a>
+            <a href="https://github.com/AppFlowy-IO/AppFlowy"
+               class="text-indigo-700 [text-decoration:none] mr-4">
+              <img src="{{ cdnBaseUrl }}images/github.png" width="20" alt="Maizzle">
+            </a>
+            <a href="https://discord.gg/9Q2xaN37tV"
+               class="text-indigo-700 [text-decoration:none] mr-4">
+              <img src="{{ cdnBaseUrl }}images/discord.png" width="20" alt="Maizzle">
+            </a>
+          </p>
+        </td>
+      </tr>
+    </table>
+  </div>
+</x-main>
\ No newline at end of file
diff --git a/libs/client-api/Cargo.toml b/libs/client-api/Cargo.toml
index f66f3cf10..d8f8a584e 100644
--- a/libs/client-api/Cargo.toml
+++ b/libs/client-api/Cargo.toml
@@ -55,6 +55,8 @@ tokio-retry = "0.3"
 tokio-util = "0.7"
 rayon = "1.10.0"
 infra = { workspace = true, features = ["file_util"] }
+base64 = "0.22"
+md5 = "0.7"
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies.tokio]
 workspace = true
diff --git a/libs/client-api/src/native/http_native.rs b/libs/client-api/src/native/http_native.rs
index a211aeb3c..46016d38b 100644
--- a/libs/client-api/src/native/http_native.rs
+++ b/libs/client-api/src/native/http_native.rs
@@ -27,19 +27,21 @@ use std::path::Path;
 use std::pin::Pin;
 use std::sync::atomic::Ordering;
 
+use base64::engine::general_purpose::STANDARD;
+use base64::Engine;
+pub use infra::file_util::ChunkedBytes;
 use rayon::prelude::IntoParallelIterator;
+use shared_entity::dto::ai_dto::CompleteTextParams;
+use shared_entity::dto::import_dto::UserImportTask;
 use std::task::{Context, Poll};
 use std::time::Duration;
 use tokio::fs::File;
+use tokio::io::{AsyncBufReadExt, BufReader};
 use tokio_retry::strategy::{ExponentialBackoff, FixedInterval};
 use tokio_retry::{Condition, RetryIf};
 use tokio_util::codec::{BytesCodec, FramedRead};
 use tracing::{debug, event, info, instrument, trace};
 
-pub use infra::file_util::ChunkedBytes;
-use shared_entity::dto::ai_dto::CompleteTextParams;
-use shared_entity::dto::import_dto::UserImportTask;
-
 impl Client {
   pub async fn stream_completion_text(
     &self,
@@ -326,6 +328,7 @@ impl Client {
   /// - The MIME type is automatically determined based on the file extension using `mime_guess`.
   ///
   pub async fn import_file(&self, file_path: &Path) -> Result<(), AppResponseError> {
+    let md5_base64 = calculate_md5(file_path).await?;
     let file = File::open(&file_path).await?;
     let metadata = file.metadata().await?;
     let file_name = file_path
@@ -352,6 +355,7 @@ impl Client {
     // set the host header
     builder = builder
       .header("X-Host", self.base_url.clone())
+      .header("X-Content-MD5", md5_base64)
       .header("X-Content-Length", metadata.len());
     let resp = builder.send().await?;
 
@@ -476,3 +480,38 @@ impl Condition<AppResponseError> for RetryGetCollabCondition {
     !error.is_record_not_found()
   }
 }
+
+/// Calculates the MD5 hash of a file and returns the base64-encoded MD5 digest.
+///
+/// # Arguments
+/// * `file_path` - The path of the file for which the MD5 hash is to be calculated.
+///
+/// # Returns
+/// A `Result` containing the base64-encoded MD5 hash on success, or an error if the file cannot be read.
+
+/// Asynchronously calculates the MD5 hash of a file using efficient buffer handling and returns it as a base64-encoded string.
+///
+/// # Arguments
+/// * `file_path` - The path to the file to be hashed.
+///
+/// # Returns
+/// Returns a `Result` containing the base64-encoded MD5 hash on success, or an error if the file cannot be read.
+pub async fn calculate_md5(file_path: &Path) -> Result<String, anyhow::Error> {
+  let file = File::open(file_path).await?;
+  let mut reader = BufReader::with_capacity(1_000_000, file);
+  let mut context = md5::Context::new();
+  loop {
+    let part = reader.fill_buf().await?;
+    if part.is_empty() {
+      break;
+    }
+
+    context.consume(part);
+    let part_len = part.len();
+    reader.consume(part_len);
+  }
+
+  let md5_hash = context.compute();
+  let md5_base64 = STANDARD.encode(md5_hash.as_ref());
+  Ok(md5_base64)
+}
diff --git a/script/client_api_deps_check.sh b/script/client_api_deps_check.sh
index 1c1984284..bced85b28 100755
--- a/script/client_api_deps_check.sh
+++ b/script/client_api_deps_check.sh
@@ -3,7 +3,7 @@
 # Generate the current dependency list
 cargo tree > current_deps.txt
 
-BASELINE_COUNT=629
+BASELINE_COUNT=631
 CURRENT_COUNT=$(cat current_deps.txt | wc -l)
 
 echo "Expected dependency count (baseline): $BASELINE_COUNT"
diff --git a/services/appflowy-worker/src/error.rs b/services/appflowy-worker/src/error.rs
index cc0b03300..adba2b958 100644
--- a/services/appflowy-worker/src/error.rs
+++ b/services/appflowy-worker/src/error.rs
@@ -33,6 +33,14 @@ pub enum ImportError {
 }
 
 impl ImportError {
+  pub fn is_file_not_found(&self) -> bool {
+    match self {
+      ImportError::ImportCollabError(err) => {
+        matches!(err, CollabImporterError::FileNotFound)
+      },
+      _ => false,
+    }
+  }
   pub fn report(&self, task_id: &str) -> (String, String) {
     match self {
       ImportError::ImportCollabError(error) => match error {
diff --git a/services/appflowy-worker/src/import_worker/worker.rs b/services/appflowy-worker/src/import_worker/worker.rs
index e1bf3821e..9d878224e 100644
--- a/services/appflowy-worker/src/import_worker/worker.rs
+++ b/services/appflowy-worker/src/import_worker/worker.rs
@@ -1,5 +1,5 @@
 use crate::import_worker::report::{ImportNotifier, ImportProgress, ImportResult};
-use crate::s3_client::{download_file, S3StreamResponse};
+use crate::s3_client::{download_file, AutoRemoveDownloadedFile, S3StreamResponse};
 use anyhow::anyhow;
 use aws_sdk_s3::primitives::ByteStream;
 
@@ -269,12 +269,19 @@ async fn process_task(
   pg_pool: &PgPool,
   notifier: Arc<dyn ImportNotifier>,
 ) -> Result<(), ImportError> {
-  trace!("[Import]: Processing task: {}", import_task);
-
   let retry_interval: u64 = get_env_var("APPFLOWY_WORKER_IMPORT_NOTION_RETRY_INTERVAL", "10")
     .parse()
     .unwrap_or(10);
 
+  let streaming = get_env_var("APPFLOWY_WORKER_IMPORT_NOTION_STREAMING", "false")
+    .parse()
+    .unwrap_or(false);
+
+  info!(
+    "[Import]: Processing task: {}, retry interval: {}, streaming: {}",
+    import_task, retry_interval, streaming
+  );
+
   match import_task {
     ImportTask::Notion(task) => {
       // 1. download zip file
@@ -284,6 +291,7 @@ async fn process_task(
         s3_client,
         3,
         Duration::from_secs(retry_interval),
+        streaming,
       )
       .await;
       match unzip_result {
@@ -343,13 +351,14 @@ pub async fn download_and_unzip_file_retry(
   s3_client: &Arc<dyn S3Client>,
   max_retries: usize,
   interval: Duration,
+  streaming: bool,
 ) -> Result<PathBuf, ImportError> {
   let mut attempt = 0;
   loop {
     attempt += 1;
-    match download_and_unzip_file(storage_dir, import_task, s3_client).await {
+    match download_and_unzip_file(storage_dir, import_task, s3_client, streaming).await {
       Ok(result) => return Ok(result),
-      Err(err) if attempt <= max_retries => {
+      Err(err) if attempt <= max_retries && !err.is_file_not_found() => {
         warn!(
           "Attempt {} failed: {}. Retrying in {:?}...",
           attempt, err, interval
@@ -375,6 +384,7 @@ async fn download_and_unzip_file(
   storage_dir: &Path,
   import_task: &NotionImportTask,
   s3_client: &Arc<dyn S3Client>,
+  streaming: bool,
 ) -> Result<PathBuf, ImportError> {
   let S3StreamResponse {
     stream,
@@ -386,7 +396,7 @@ async fn download_and_unzip_file(
     .map_err(|err| ImportError::Internal(err.into()))?;
   let buffer_size = buffer_size_from_content_length(content_length);
 
-  let zip_reader = get_zip_reader(storage_dir, stream, buffer_size).await?;
+  let zip_reader = get_zip_reader(storage_dir, stream, buffer_size, streaming).await?;
   let unique_file_name = Uuid::new_v4().to_string();
   let output_file_path = storage_dir.join(unique_file_name);
   fs::create_dir_all(&output_file_path)
@@ -399,13 +409,16 @@ async fn download_and_unzip_file(
       ImportError::Internal(anyhow!("Failed to set permissions for temp dir: {:?}", err))
     })?;
 
-  let unzip_file = unzip_stream(zip_reader, output_file_path)
-    .await
-    .map_err(ImportError::Internal)?;
-
+  let unzip_file = unzip_stream(zip_reader.inner, output_file_path).await?;
   Ok(unzip_file.unzip_dir_path)
 }
 
+struct ZipReader {
+  inner: ZipFileReader<Ready<Pin<Box<dyn AsyncBufRead + Unpin + Send>>>>,
+  #[allow(dead_code)]
+  file: Option<AutoRemoveDownloadedFile>,
+}
+
 /// Asynchronously returns a `ZipFileReader` that can read from a stream or a downloaded file, based on the environment setting.
 ///
 /// This function checks whether streaming is enabled via the `APPFLOWY_WORKER_IMPORT_NOTION_STREAMING` environment variable.
@@ -416,21 +429,31 @@ async fn get_zip_reader(
   storage_dir: &Path,
   stream: Box<dyn AsyncBufRead + Unpin + Send>,
   buffer_size: usize,
-) -> Result<ZipFileReader<Ready<Pin<Box<dyn AsyncBufRead + Unpin + Send>>>>, ImportError> {
-  let streaming = get_env_var("APPFLOWY_WORKER_IMPORT_NOTION_STREAMING", "true")
-    .parse()
-    .unwrap_or(true);
-
+  streaming: bool,
+) -> Result<ZipReader, ImportError> {
   let zip_reader = if streaming {
+    // Occasionally, we encounter the error 'unable to locate the end of central directory record'
+    // when streaming a ZIP file to async-zip. This indicates that the ZIP reader couldn't find
+    // the necessary end-of-file marker. The issue might occur if the entire ZIP file has not been
+    // fully downloaded or buffered before the reader attempts to process the end-of-file information.
     let reader = futures::io::BufReader::with_capacity(buffer_size, stream);
     let boxed_reader: Pin<Box<dyn AsyncBufRead + Unpin + Send>> = Box::pin(reader);
-    async_zip::base::read::stream::ZipFileReader::new(boxed_reader)
+    ZipReader {
+      inner: async_zip::base::read::stream::ZipFileReader::new(boxed_reader),
+      file: None,
+    }
   } else {
-    let zip_file_path = download_file(storage_dir, stream).await?;
-    let file = fs::File::open(&zip_file_path).await.unwrap();
-    let reader = tokio::io::BufReader::with_capacity(buffer_size, file).compat();
+    let file = download_file(storage_dir, stream).await?;
+    let handle = fs::File::open(&file)
+      .await
+      .map_err(|err| ImportError::Internal(err.into()))?;
+    let reader = tokio::io::BufReader::with_capacity(buffer_size, handle).compat();
     let boxed_reader: Pin<Box<dyn AsyncBufRead + Unpin + Send>> = Box::pin(reader);
-    async_zip::base::read::stream::ZipFileReader::new(boxed_reader)
+    ZipReader {
+      inner: async_zip::base::read::stream::ZipFileReader::new(boxed_reader),
+      // Make sure the lifetime of file is the same as zip reader.
+      file: Some(file),
+    }
   };
   Ok(zip_reader)
 }
diff --git a/src/api/data_import.rs b/src/api/data_import.rs
index a0a75b702..f05fd35d7 100644
--- a/src/api/data_import.rs
+++ b/src/api/data_import.rs
@@ -9,6 +9,8 @@ use aws_sdk_s3::primitives::ByteStream;
 use database::file::BucketClient;
 
 use crate::biz::workspace::ops::{create_empty_workspace, create_upload_task};
+use base64::engine::general_purpose::STANDARD;
+use base64::Engine;
 use database::user::select_name_and_email_from_uuid;
 use database::workspace::select_import_task;
 use futures_util::StreamExt;
@@ -74,9 +76,36 @@ async fn import_data_handler(
     .and_then(|s| s.parse::<usize>().ok())
     .unwrap_or(0);
 
+  let md5 = req
+    .headers()
+    .get("X-Content-MD5")
+    .and_then(|h| h.to_str().ok())
+    .unwrap_or("");
+
   let file_path = temp_dir().join(format!("import_data_{}.zip", Uuid::new_v4()));
   let file = write_multiple_part(&mut payload, file_path).await?;
 
+  trace!(
+    "[Import] content length: {}, content md5: {}",
+    content_length,
+    md5
+  );
+  if file.md5_base64 != md5 {
+    trace!(
+      "Import file fail. The Content-MD5:{} doesn't match file md5:{}",
+      md5,
+      file.md5_base64
+    );
+
+    return Err(
+      AppError::InvalidRequest(format!(
+        "Content-MD5:{} doesn't match file md5:{}",
+        md5, file.md5_base64
+      ))
+      .into(),
+    );
+  }
+
   if content_length != file.size {
     trace!(
       "Import file fail. The Content-Length:{} doesn't match file size:{}",
@@ -113,7 +142,7 @@ async fn import_data_handler(
   })?;
   state
     .bucket_client
-    .put_blob_as_content_type(&workspace_id, stream, "zip")
+    .put_blob_as_content_type(&workspace_id, stream, "application/zip")
     .await?;
 
   create_upload_task(
@@ -132,10 +161,11 @@ async fn import_data_handler(
   Ok(AppResponse::Ok().into())
 }
 
-struct AutoDeletedFile {
+pub struct AutoDeletedFile {
   name: String,
   file_path: PathBuf,
   size: usize,
+  md5_base64: String,
 }
 
 impl Drop for AutoDeletedFile {
@@ -152,38 +182,60 @@ impl Drop for AutoDeletedFile {
     });
   }
 }
-
-async fn write_multiple_part(
+pub async fn write_multiple_part(
   payload: &mut Multipart,
   file_path: PathBuf,
 ) -> Result<AutoDeletedFile, AppError> {
   let mut file_name = "".to_string();
   let mut file_size = 0;
+
+  // Create the file to write to
   let mut file = File::create(&file_path).await?;
+  let mut context = md5::Context::new();
+
+  // Process the multipart form fields
   while let Some(Ok(mut field)) = payload.next().await {
+    // Extract the file name from the content disposition
     file_name = field
       .content_disposition()
       .and_then(|c| c.get_name().map(|f| f.to_string()))
       .unwrap_or_else(|| format!("import-{}", chrono::Local::now().format("%d/%m/%Y %H:%M")));
 
+    // Write data chunks to the file and update the MD5 context
     while let Some(Ok(data)) = field.next().await {
       file_size += data.len();
       file.write_all(&data).await?;
+      context.consume(&data);
     }
   }
+
+  // Flush and close the file
   file.shutdown().await?;
   drop(file);
 
+  // If file_name is empty, remove the file and return an error
   if file_name.is_empty() {
+    if let Err(err) = tokio::fs::remove_file(&file_path).await {
+      error!(
+        "Failed to delete the file: {:?} when importing data, error: {}",
+        file_path, err
+      );
+    }
     return Err(AppError::InvalidRequest(
-      "Can not get the file name".to_string(),
+      "Cannot get the file name".to_string(),
     ));
   }
 
+  // Finalize the MD5 hash and encode it in base64
+  let digest = context.compute();
+  let md5_base64 = STANDARD.encode(digest.as_ref());
+
+  // Return the file metadata and the calculated MD5 hash
   Ok(AutoDeletedFile {
     name: file_name,
     file_path,
     size: file_size,
+    md5_base64,
   })
 }