diff --git a/f2/src/utils/encryptedEmail.js b/f2/src/utils/encryptedEmail.js
index cce691864..cc87b6dc4 100644
--- a/f2/src/utils/encryptedEmail.js
+++ b/f2/src/utils/encryptedEmail.js
@@ -100,7 +100,15 @@ const encryptFile = (uid, emailAddress, data, sendMail) => {
             else {
               const attachment = fs.readFileSync(encryptedFile)
               console.log('Encrypted File: File encrypted')
-              sendMail(emailAddress, attachment, data.reportId, 'Attachment')
+              if (file.isImageRacyClassified || file.isImageAdultClassified)
+                sendMail(
+                  emailAddress,
+                  attachment,
+                  data.reportId,
+                  'WARNING: potential offensive image',
+                )
+              else
+                sendMail(emailAddress, attachment, data.reportId, 'Attachment')
             }
           },
         )
@@ -129,9 +137,9 @@ async function sendMail(emailAddress, attachment, reportId, emailType) {
   const message = {
     from: mailFrom,
     to: emailAddress,
-    subject: `Report - reference number: ${reportId} ${emailType}`,
+    subject: `NCFRS - ref ${reportId} : ${emailType}`,
     text: 'Plaintext version of the message',
-    html: 'pHTML version of the message/p',
+    html: 'HTML version of the message',
     attachments: [
       {
         raw: attachment,