diff --git a/jdav_web/mailer/admin.py b/jdav_web/mailer/admin.py
index 936a8cd..c12c4b1 100644
--- a/jdav_web/mailer/admin.py
+++ b/jdav_web/mailer/admin.py
@@ -43,12 +43,16 @@ class MessageAdmin(admin.ModelAdmin):
         if "_send" in request.POST:
             if not obj.submit():
                 messages.error(request, _("Failed to send message"))
+            else:
+                messages.info(request, _("Successfully sent message"))
         return super(MessageAdmin, self).response_change(request, obj)
 
     def response_add(self, request, obj):
         if "_send" in request.POST:
             if not obj.submit():
                 messages.error(request, _("Failed to send message"))
+            else:
+                messages.info(request, _("Successfully sent message"))
         return super(MessageAdmin, self).response_add(request, obj)
 
 
diff --git a/jdav_web/mailer/models.py b/jdav_web/mailer/models.py
index 6e03115..d76ae5f 100644
--- a/jdav_web/mailer/models.py
+++ b/jdav_web/mailer/models.py
@@ -59,6 +59,10 @@ class Message(models.Model):
         success = send(self.subject, get_content(self.content),
                        self.from_addr, [member.email for member in members],
                        attachments=attach)
+        for a in Attachment.objects.filter(msg__id=self.pk):
+            if a.f.name:
+                os.remove(a.f.path)
+            a.delete()
         if success:
             self.sent = True
             self.save()