diff --git a/JournalApp/Components/Dialogs/CustomMessageBox.razor b/JournalApp/Components/Dialogs/CustomMessageBox.razor
index 4976f54..5c35cab 100644
--- a/JournalApp/Components/Dialogs/CustomMessageBox.razor
+++ b/JournalApp/Components/Dialogs/CustomMessageBox.razor
@@ -29,7 +29,7 @@
 		<div class="@("d-flex align-center justify-space-between" + (ShowFeedbackLink ? " flex-grow-1" : ""))">
 			@if (ShowFeedbackLink)
 			{
-				<MudLink Href="@(FeedbackService.GenerateLink(body: Message))" Typo="Typo.subtitle2">Send feedback...</MudLink>
+				<MudLink Href="@(FeedbackService.GenerateLink(body: $"\"{Message}\""))" Typo="Typo.subtitle2">Send feedback...</MudLink>
 			}
 
 			<div tabindex="-1" @onkeydown="HandleKeyDown">
diff --git a/JournalApp/Data/FeedbackService.cs b/JournalApp/Data/FeedbackService.cs
index 02ad047..821dfa3 100644
--- a/JournalApp/Data/FeedbackService.cs
+++ b/JournalApp/Data/FeedbackService.cs
@@ -8,17 +8,12 @@ public static class FeedbackService
     public static string GenerateLink(string subject = null, string body = null)
     {
         var deviceInfo = DeviceInfo.Current;
+        var deviceInfoString = $"{ThisAssembly.AssemblyInformationalVersion} | {deviceInfo.Platform} {deviceInfo.VersionString} | {deviceInfo.Manufacturer} {deviceInfo.Model}";
 
-        var finalSubject = "JournalApp: ";
+        subject = "JournalApp: " + subject;
 
-        if (!string.IsNullOrWhiteSpace(subject))
-            finalSubject += subject;
+        body += "%0D%0A" + deviceInfoString + "%0D%0A";
 
-        var finalBody = $"{deviceInfo.Platform} {deviceInfo.VersionString}%0D%0A{deviceInfo.Manufacturer} {deviceInfo.Model}%0D%0A%0D%0A";
-
-        if (!string.IsNullOrWhiteSpace(body))
-            finalBody += body;
-
-        return $"mailto:{Email}?subject={finalSubject}&body={finalBody}".Replace(" ", "%20");
+        return $"mailto:{Email}?subject={subject}&body=%0D%0A{body}".Replace(" ", "%20");
     }
 }