diff --git a/application/controllers/Oqrs.php b/application/controllers/Oqrs.php
index 3500ad1d..f7830889 100644
--- a/application/controllers/Oqrs.php
+++ b/application/controllers/Oqrs.php
@@ -160,11 +160,13 @@ class Oqrs extends CI_Controller {
 			}
 
 			$data['callsign'] = $this->security->xss_clean($postdata['callsign']);
+			$data['usermessage'] = $this->security->xss_clean($postdata['message']);
 
 			$message = $this->load->view('email/oqrs_request', $data,  TRUE);
 
 			$this->email->from('noreply@cloudlog.co.uk', 'Cloudlog');
 			$this->email->to($email);
+			$this->email->reply_to($this->security->xss_clean($postdata['email']), strtoupper($data['callsign']));
 
 			$this->email->subject('Cloudlog OQRS from ' . strtoupper($data['callsign']));
 			$this->email->message($message);
diff --git a/application/views/email/oqrs_request.php b/application/views/email/oqrs_request.php
index 1518fc85..c35ec6cc 100644
--- a/application/views/email/oqrs_request.php
+++ b/application/views/email/oqrs_request.php
@@ -1,8 +1,14 @@
 Hi,
 
-You got an OQRS request from <?php echo strtoupper($callsign); ?>. 
+You got an OQRS request from <?php echo strtoupper($callsign); ?>.
+<?php if ($usermessage != "") { ?>
+The user entered the following message:
+
+<?php echo $usermessage."\n"; ?>
+<?php } ?>
+
 Please log into your Cloudlog and process it.
 
 Regards,
 
-Cloudlog.
\ No newline at end of file
+Cloudlog.