diff --git a/rowers/tasks.py b/rowers/tasks.py
index d8e7716c..db9e0b9c 100644
--- a/rowers/tasks.py
+++ b/rowers/tasks.py
@@ -116,7 +116,9 @@ from requests_oauthlib import OAuth1, OAuth1Session
 
 import pandas as pd
 import polars as pl
-from polars.exceptions import ColumnNotFoundError
+from polars.exceptions import (
+    ColumnNotFoundError, ComputeError
+    )
 
 
 from django_rq import job
diff --git a/rowers/templates/user_messages.html b/rowers/templates/user_messages.html
index 576fcda7..60a01b82 100644
--- a/rowers/templates/user_messages.html
+++ b/rowers/templates/user_messages.html
@@ -3,7 +3,20 @@
 {% block title %}Messages{% endblock %}
 
 {% block main %}
-<h1>{{ rower.user.first_name }}'s New Messages</h1>
+
+<ul class="main-content">
+  <p>
+    <li class="grid_4">
+      <a href="/rowers/me/messages/delete/">
+	<i class="fas fa-trash fa-fw"></i>
+	Remove all messages
+      </a>
+    </li>
+  </p>
+</ul>
+
+  <h1>{{ rower.user.first_name }}'s New Messages</h1>
+
 
 <ul class="main-content">
   {% for usermessage in usermessages %}
diff --git a/rowers/tests/testdata/testdata.tcx.gz b/rowers/tests/testdata/testdata.tcx.gz
index cca9807a..c23e868f 100644
Binary files a/rowers/tests/testdata/testdata.tcx.gz and b/rowers/tests/testdata/testdata.tcx.gz differ
diff --git a/rowers/urls.py b/rowers/urls.py
index ed1f68c8..34fdc057 100644
--- a/rowers/urls.py
+++ b/rowers/urls.py
@@ -647,7 +647,8 @@ urlpatterns = [
             views.alert_report_view, name='alert_report_view'),
     re_path(r'^me/deactivate/$', views.deactivate_user, name='deactivate_user'),
     re_path(r'^me/messages/$', views.user_messages, name='user_messages'),
-    re_path(r'^me/messages/(?P<id>\d+)/delete/$', views.user_message_delete, name='user_message_delete'),
+    re_path(r'^me/messages/$', views.user_messages, name='user_messages'),
+    re_path(r'^me/messages/delete/$', views.user_messages_delete_all, name='user_messages_delete_all'),
     re_path(r'^me/messages/(?P<id>\d+)/markread/$', views.user_message_markread, name='user_message_markread'),
     re_path(r'^me/messages/user/(?P<userid>\d+)/$', views.user_messages, name='user_messages'),
     re_path(r'^me/delete/$', views.remove_user, name='remove_user'),
diff --git a/rowers/views/userviews.py b/rowers/views/userviews.py
index cd42ad56..0c1eed43 100644
--- a/rowers/views/userviews.py
+++ b/rowers/views/userviews.py
@@ -248,6 +248,20 @@ def start_plantrial_view(request):
 
     return HttpResponseRedirect(url)
 
+@login_required()
+def user_messages_delete_all(request, userid=0):
+    r = getrower(request.user)
+
+    usermessages = UserMessage.objects.filter(receiver=r)
+    for m in usermessages:
+        m.delete()
+
+    messages.info(request,"Messages Deleted")
+
+    url = reverse('user_messages')
+    
+    return HttpResponseRedirect(url)
+
 @login_required()
 @permission_required('rower.is_coach', fn=get_user_by_userid, raise_exception=True)
 def user_messages(request,userid=0):