diff --git a/app.go b/app.go
index 13d23ac..f5c82a7 100644
--- a/app.go
+++ b/app.go
@@ -10,8 +10,11 @@ import (
 	"strings"
 	"sync"
 	"time"
+	"unicode/utf8"
 
 	"golang.org/x/sys/windows/registry"
+	"golang.org/x/text/encoding/charmap"
+	"golang.org/x/text/transform"
 
 	"emly/backend/utils"
 	internal "emly/backend/utils/mail"
@@ -517,3 +520,17 @@ func (a *App) IsDebuggerRunning() bool {
 	}
 	return utils.IsDebugged()
 }
+
+func (a *App) ConvertToUTF8(s string) string {
+	if utf8.ValidString(s) {
+		return s
+	}
+
+	// If invalid UTF-8, assume Windows-1252 (superset of ISO-8859-1)
+	decoder := charmap.Windows1252.NewDecoder()
+	decoded, _, err := transform.String(decoder, s)
+	if err != nil {
+		return s // Return as-is if decoding fails
+	}
+	return decoded
+}
diff --git a/config.ini b/config.ini
index 5bea096..e03a372 100644
--- a/config.ini
+++ b/config.ini
@@ -1,6 +1,6 @@
 [EMLy]
 SDK_DECODER_SEMVER="1.3.1"
 SDK_DECODER_RELEASE_CHANNEL="beta"
-GUI_SEMVER="1.3.0"
+GUI_SEMVER="1.3.1"
 GUI_RELEASE_CHANNEL="beta"
 LANGUAGE="it"
\ No newline at end of file
diff --git a/frontend/src/lib/components/MailViewer.svelte b/frontend/src/lib/components/MailViewer.svelte
index 6114349..2bc34f6 100644
--- a/frontend/src/lib/components/MailViewer.svelte
+++ b/frontend/src/lib/components/MailViewer.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
   import { X, MailOpen, Image, FileText, File, ShieldCheck, Shield, Signature, FileCode, Loader2 } from "@lucide/svelte";
-  import { ShowOpenFileDialog, ReadEML, OpenPDF, OpenImageWindow, OpenPDFWindow, OpenImage, ReadMSG, ReadPEC, OpenEMLWindow } from "$lib/wailsjs/go/main/App";
+  import { ShowOpenFileDialog, ReadEML, OpenPDF, OpenImageWindow, OpenPDFWindow, OpenImage, ReadMSG, ReadPEC, OpenEMLWindow, ConvertToUTF8 } from "$lib/wailsjs/go/main/App";
   import type { internal } from "$lib/wailsjs/go/models";
   import { sidebarOpen } from "$lib/stores/app";
   import { onDestroy, onMount } from "svelte";
@@ -10,6 +10,7 @@
   import { settingsStore } from "$lib/stores/settings.svelte";
   import * as m from "$lib/paraglide/messages";
   import { dev } from "$app/environment";
+  import { isBase64, isHtml } from "$lib/utils";
 
   let unregisterEvents = () => {};
   let isLoading = $state(false);
@@ -23,13 +24,49 @@
   }
 
   $effect(() => {
-    if(dev) {
-      console.log(mailState.currentEmail)
-    }
-    console.info("Current email changed:", mailState.currentEmail?.subject);
-    if(mailState.currentEmail !== null) {
-      sidebarOpen.set(false);
-    }
+    const process = async () => {
+      if (mailState.currentEmail?.body) {
+        let content = mailState.currentEmail.body;
+        // 1. Try to decode if not HTML
+        if (!isHtml(content)) {
+          const clean = content.replace(/[\s\r\n]+/g, '');
+          if (isBase64(clean)) {
+            try {
+              const decoded = window.atob(clean);
+              content = decoded;
+            } catch (e) {
+              console.warn("Failed to decode base64 body:", e);
+            }
+          }
+        }
+
+        // 2. If it is HTML (original or decoded), try to fix encoding
+        if (isHtml(content)) {
+            try {
+              const fixed = await ConvertToUTF8(content);
+              if (fixed) {
+                content = fixed;
+              }
+            } catch (e) { 
+                console.warn("Failed to fix encoding:", e);
+            }
+        }
+        
+        // 3. Update if changed
+        if (content !== mailState.currentEmail.body) {
+           mailState.currentEmail.body = content;
+        }
+      }
+
+      if(dev) {
+        console.log(mailState.currentEmail)
+      }
+      console.info("Current email changed:", mailState.currentEmail?.subject);
+      if(mailState.currentEmail !== null) {
+        sidebarOpen.set(false);
+      }
+    };
+    process();
   })
 
   onDestroy(() => {
diff --git a/frontend/src/lib/utils.ts b/frontend/src/lib/utils.ts
index 1413a6a..22787b8 100644
--- a/frontend/src/lib/utils.ts
+++ b/frontend/src/lib/utils.ts
@@ -10,4 +10,18 @@ export type WithoutChild<T> = T extends { child?: any } ? Omit<T, "child"> : T;
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 export type WithoutChildren<T> = T extends { children?: any } ? Omit<T, "children"> : T;
 export type WithoutChildrenOrChild<T> = WithoutChildren<WithoutChild<T>>;
-export type WithElementRef<T, U extends HTMLElement = HTMLElement> = T & { ref?: U | null };
\ No newline at end of file
+export type WithElementRef<T, U extends HTMLElement = HTMLElement> = T & { ref?: U | null };
+
+export function isBase64(str: string): boolean {
+	if (!str) return false;
+	const base64Regex = /^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$/;
+	return base64Regex.test(str);
+}
+
+export function isHtml(str: string): boolean {
+	if (!str) return false;
+	const htmlRegex = /<[^>]+>/;
+	return htmlRegex.test(str);
+}
+
+
diff --git a/installer/installer.iss b/installer/installer.iss
index 459cfe4..da82a5a 100644
--- a/installer/installer.iss
+++ b/installer/installer.iss
@@ -1,6 +1,6 @@
 #define ApplicationName 'EMLy'
 #define ApplicationVersion GetVersionNumbersString('EMLy.exe')
-#define ApplicationVersion '1.2.4_beta'
+#define ApplicationVersion '1.3.1_beta'
 
 [Setup]
 AppName={#ApplicationName}