diff --git a/WireAnalytics/Sources/WireDatadog/WireFakeDatadog.swift b/WireAnalytics/Sources/WireDatadog/WireFakeDatadog.swift
index a4072d5b3f5..235e8e5ce8c 100644
--- a/WireAnalytics/Sources/WireDatadog/WireFakeDatadog.swift
+++ b/WireAnalytics/Sources/WireDatadog/WireFakeDatadog.swift
@@ -21,8 +21,8 @@ public import WireLogging
 
 public final class WireDatadog {
 
-    public var userIdentifier: String {
-        ""
+    public var userIdentifier: String? {
+        nil
     }
 
     public init(
diff --git a/wire-ios/Wire-iOS/Sources/UserInterface/Settings/Debug Report/LogFilesProvider.swift b/wire-ios/Wire-iOS/Sources/UserInterface/Settings/Debug Report/LogFilesProvider.swift
index 4fdc7b5f3ec..689dfa87653 100644
--- a/wire-ios/Wire-iOS/Sources/UserInterface/Settings/Debug Report/LogFilesProvider.swift	
+++ b/wire-ios/Wire-iOS/Sources/UserInterface/Settings/Debug Report/LogFilesProvider.swift	
@@ -144,7 +144,7 @@ struct LogFilesProvider: LogFilesProviding {
         return url
     }
 
-    private func createInfoFile(at url: URL) throws -> URL {
+    var info: String {
         let date = Date()
 
         var body = """
@@ -159,10 +159,13 @@ struct LogFilesProvider: LogFilesProviding {
             // display only when enabled
             body.append("\nDatadog ID: \(datadogUserIdentifier)")
         }
+        return body
+    }
 
+    private func createInfoFile(at url: URL) throws -> URL {
         let infoFileURL = url.appendingPathComponent("info.txt")
 
-        try body.write(
+        try info.write(
             to: infoFileURL,
             atomically: true,
             encoding: .utf8
diff --git a/wire-ios/Wire-iOS/Sources/UserInterface/Settings/MFMailComposeViewController+Logs.swift b/wire-ios/Wire-iOS/Sources/UserInterface/Settings/MFMailComposeViewController+Logs.swift
index e9878040bac..ac0634254d9 100644
--- a/wire-ios/Wire-iOS/Sources/UserInterface/Settings/MFMailComposeViewController+Logs.swift
+++ b/wire-ios/Wire-iOS/Sources/UserInterface/Settings/MFMailComposeViewController+Logs.swift
@@ -25,24 +25,12 @@ import WireSystem
 extension MFMailComposeViewController {
 
     func prefilledBody(withMessage message: String = "") -> String {
-        let date = Date()
-        let device = UIDevice.current.zm_model()
-
         var body = """
         --DO NOT EDIT--
-        App Version: \(Bundle.main.appInfo.fullVersion)
-        Bundle id: \(Bundle.main.bundleIdentifier ?? "-")
-        Device: \(device)
-        iOS version: \(UIDevice.current.systemVersion)
-        Date: \(date.transportString())
+        \(LogFilesProvider().info)
+        ---------------\n
         """
 
-        if let datadogUserIdentifier = WireAnalytics.Datadog.userIdentifier {
-            // display only when enabled
-            body.append("\nDatadog ID: \(datadogUserIdentifier)")
-        }
-
-        body.append("\n---------------\n")
         typealias l10n = L10n.Localizable.Self.Settings.TechnicalReport.MailBody
         let details = """
         \(l10n.firstline)