diff --git a/rowers/emails.py b/rowers/emails.py
index 87583c48..bf64c90a 100644
--- a/rowers/emails.py
+++ b/rowers/emails.py
@@ -27,7 +27,7 @@ from rowsandall_app.settings import SITE_URL
 from rowsandall_app.settings_dev import SITE_URL as SITE_URL_DEV
 from rowsandall_app.settings import PROGRESS_CACHE_SECRET
 from rowsandall_app.settings import SETTINGS_NAME
-
+from rowers.models import UserMessage, Rower, User
 
 import pandas as pd
 
@@ -112,6 +112,18 @@ def send_template_email(from_email, to_email, subject,
     else:
         emailbounced = False
 
+    try:
+        usr = User.objects.get(email=to_email)
+        umsg = UserMessage(
+            receiver = usr.rower,
+            datetime = timezone.now(),
+            text = text_content,
+            subject=subject,
+        )
+        umsg.save()
+    except User.DoesNotExist:
+        pass
+
     if not emailbounced:
         res = msg.send()
     else:  # pragma: no cover
diff --git a/rowers/models.py b/rowers/models.py
index b2053e0c..5ab064b3 100644
--- a/rowers/models.py
+++ b/rowers/models.py
@@ -1241,6 +1241,13 @@ class DeleteUserForm(forms.ModelForm):
         model = User
         fields = []
 
+class UserMessage(models.Model):
+    receiver = models.ForeignKey(Rower, on_delete=models.CASCADE)
+    datetime = models.DateTimeField()
+    isread = models.BooleanField(default=False)
+    text = models.CharField(max_length=1000)
+    subject = models.CharField(max_length=100,default='Message')
+        
 # requestor is user
 
 
diff --git a/rowers/tests/testdata/testdata.tcx.gz b/rowers/tests/testdata/testdata.tcx.gz
index 56e95994..121a02f7 100644
Binary files a/rowers/tests/testdata/testdata.tcx.gz and b/rowers/tests/testdata/testdata.tcx.gz differ