diff --git a/application/controllers/Oqrs.php b/application/controllers/Oqrs.php
index eeeffc0f4..ec2005bb0 100644
--- a/application/controllers/Oqrs.php
+++ b/application/controllers/Oqrs.php
@@ -232,8 +232,8 @@ class Oqrs extends CI_Controller {
 				$this->email->to($email);
 				$this->email->reply_to($this->security->xss_clean($postdata['email']), strtoupper($data['callsign']));
 
-				$this->email->subject('Wavelog OQRS from ' . strtoupper($data['callsign']));
-				$this->email->message($message);
+				$this->email->subject($message['subject']);
+				$this->email->message($message['body']);
 
 				if (! $this->email->send()) {
 					log_message('error', 'OQRS Alert! Email settings are incorrect.');
diff --git a/application/controllers/User.php b/application/controllers/User.php
index c9487af2b..20c66a62d 100644
--- a/application/controllers/User.php
+++ b/application/controllers/User.php
@@ -1011,8 +1011,8 @@ class User extends CI_Controller {
 					$this->email->from($this->optionslib->get_option('emailAddress'), $this->optionslib->get_option('emailSenderName'));
 					$this->email->to($email);
 
-					$this->email->subject('Wavelog Account Password Reset');
-					$this->email->message($message);
+					$this->email->subject($message['subject']);
+					$this->email->message($message['body']);
 
 					if (! $this->email->send())
 					{
@@ -1098,8 +1098,8 @@ class User extends CI_Controller {
 
 						$this->email->from($this->optionslib->get_option('emailAddress'), $this->optionslib->get_option('emailSenderName'));
 						$this->email->to($data->user_email);
-						$this->email->subject('Wavelog Account Password Reset');
-						$this->email->message($message);
+						$this->email->subject($message['subject']);
+						$this->email->message($message['body']);
 
 						if (! $this->email->send())
 						{
diff --git a/application/views/email/admin_reset_password.php b/application/views/email/admin_reset_password.php
index 46ef231df..e67bda92b 100644
--- a/application/views/email/admin_reset_password.php
+++ b/application/views/email/admin_reset_password.php
@@ -1,6 +1,8 @@
-<?= 
+<?php
 
-sprintf(__("Hello %s"), $user_firstname . ", " . $user_callsign) . "\n\n" .
+$message['subject'] = __("Wavelog Account Password Reset");
+
+$message['body'] = sprintf(__("Hello %s"), $user_firstname . ", " . $user_callsign) . "\n\n" .
 
 __("An admin initiated a password reset for your Wavelog account.") . "\n\n" . 
 
@@ -13,3 +15,5 @@ __("If you didn't request any password reset, just ignore this email and talk to
 Regards,
 
 Wavelog");
+
+echo json_encode($message);
\ No newline at end of file
diff --git a/application/views/email/forgot_password.php b/application/views/email/forgot_password.php
index 0accb34af..ac56120e2 100644
--- a/application/views/email/forgot_password.php
+++ b/application/views/email/forgot_password.php
@@ -1,8 +1,10 @@
-<?= 
+<?php 
 
-__("Hi,
+$message['subject'] = __("Wavelog Account Password Reset");
 
-You or someone else has requested a password reset on your Wavelog account.") . "\n\n" . __("Log View") . "\n\n" .
+$message['body'] = __("Hi,
+
+You or someone else has requested a password reset on your Wavelog account.") . "\n\n" .
 
 sprintf(__("Your password reset code is: %s"), $reset_code) . "\n\n" .
 
@@ -12,4 +14,6 @@ __("If you didn't request this just ignore.
 
 Regards,
 
-Wavelog");
\ No newline at end of file
+Wavelog");
+
+echo json_encode($message);
\ No newline at end of file
diff --git a/application/views/email/oqrs_request.php b/application/views/email/oqrs_request.php
index b0ec99a06..40b509691 100644
--- a/application/views/email/oqrs_request.php
+++ b/application/views/email/oqrs_request.php
@@ -1,21 +1,26 @@
 <?php
 
+$message['subject'] = sprintf(__("Wavelog OQRS from %s"), strtoupper($callsign));
+
 if ($usermessage != '') {
-    $usermessage = __("The user entered the following message:
-    
-    %s", $usermessage);
+    $um_formatted = __("The user entered the following message: ") . "\n\n";
+    $um_formatted .= "------------" . "\n";
+    $um_formatted .= $usermessage . "\n";
+    $um_formatted .= "------------" . "\n\n";
 } else {
-    $usermessage = __("The user did not enter any additional message.");
+    $um_formatted = __("The user did not enter any additional message.") . "\n\n";
 }
 
-echo sprintf( __("Hi,
+$message['body'] = sprintf( __("Hi,
 
 You got an OQRS request from %s."), strtoupper($callsign)) . "\n\n" .
 
-$usermessage . "\n\n" .
+$um_formatted .
 
 __("Please log into your Wavelog and process it.
 
 Regards,
 
 Wavelog");
+
+echo json_encode($message);
\ No newline at end of file