diff --git a/src/js/app-config.js b/src/js/app-config.js
index d058d35..6e2420f 100644
--- a/src/js/app-config.js
+++ b/src/js/app-config.js
@@ -88,7 +88,7 @@ appCfg.string = {
     certificateFaqLink: 'https://github.com/whiteout-io/mail-html5/wiki/FAQ#what-does-the-ssl-certificate-for-the-mail-server--changed-mean',
     bugReportTitle: 'Report a bug',
     bugReportSubject: '[Bug] I want to report a bug',
-    bugReportBody: 'Steps to reproduce\n1. \n2. \n3. \n\nWhat happens?\n\n\nWhat do you expect to happen instead?\n\n\n\n== PLEASE DONT PUT ANY KEYS HERE! ==\n\n\n## Log\n\nBelow is the log. It includes your interactions with your email provider in an anonymized way from the point where you started the app for the last time. Any information provided by you will be used for the porpose of locating and fixing the bug you reported. It will be deleted subsequently. However, you can edit this log and/or remove log data in the event that something would show up.\n\n',
+    bugReportBody: 'Steps to reproduce\n1. \n2. \n3. \n\nWhat happens?\n\n\nWhat do you expect to happen instead?\n\n\n\n== PLEASE DONT PUT ANY KEYS HERE! ==\n\n\n## Log\n\nBelow is the log. It includes your interactions with your email provider in an anonymized way from the point where you started the app for the last time. Any information provided by you will be used for the porpose of locating and fixing the bug you reported. It will be deleted subsequently. However, you can edit this log and/or remove log data in the event that something would show up.\n\nUser-Agent: {0}\nVersion: {1}\n\n',
     supportAddress: 'mail.support@whiteout.io',
     connDocOffline: 'It appears that you are offline. Please retry when you are online.',
     connDocTlsWrongCert: 'A connection to {0} was rejected because the TLS certificate is invalid. Please have a look at the FAQ for information on how to fix this error.',
diff --git a/src/js/controller/app/write.js b/src/js/controller/app/write.js
index b447a19..f61b5d5 100644
--- a/src/js/controller/app/write.js
+++ b/src/js/controller/app/write.js
@@ -9,6 +9,7 @@ var util = require('crypto-lib').util;
 var WriteCtrl = function($scope, $filter, $q, appConfig, auth, keychain, pgp, email, outbox, dialog, axe) {
 
     var str = appConfig.string;
+    var cfg = appConfig.config;
 
     // set default value so that the popover height is correct on init
     $scope.keyId = 'XXXXXXXX';
@@ -93,8 +94,7 @@ var WriteCtrl = function($scope, $filter, $q, appConfig, auth, keychain, pgp, em
         }];
         $scope.writerTitle = str.bugReportTitle;
         $scope.subject = str.bugReportSubject;
-        $scope.body = str.bugReportBody + dump;
-
+        $scope.body = str.bugReportBody.replace('{0}', navigator.userAgent).replace('{1}', cfg.appVersion) + dump;
     }
 
     function fillFields(re, replyAll, forward) {