3 files changed, 9 insertions, 5 deletions
diff --git a/group_messaging/__init__.py b/group_messaging/__init__.py
index 642ad5c8..ed3d73ff 100644
--- a/group_messaging/__init__.py
+++ b/group_messaging/__init__.py
@@ -11,4 +11,7 @@ the group should be named `'_personal_1'`.
 
 Only one person must be a member of a personal group and
 each user must have such group.
+
+TODO: decouple this application
+first step is to package send_mail separately
 """
diff --git a/group_messaging/models.py b/group_messaging/models.py
index 9cc12786..5d43baf8 100644
--- a/group_messaging/models.py
+++ b/group_messaging/models.py
@@ -4,7 +4,7 @@ import copy
 import datetime
 import urllib
 from askbot.mail import send_mail #todo: remove dependency?
-from coffin.template.loader import get_template
+from django.template.loader import get_template
 from django.db import models
 from django.db.models import signals
 from django.conf import settings as django_settings
@@ -395,9 +395,10 @@ class Message(models.Model):
             #in the template we have a placeholder to be replaced like this:
             body_text = body_text.replace('THREAD_URL_HOLE', thread_url)
             send_mail(
-                recipient_list=[user.email,],
-                subject_line=subject,
-                body_text=body_text
+                subject,
+                body_text,
+                django_settings.DEFAULT_FROM_EMAIL,
+                [user.email,],
             )
 
 
diff --git a/group_messaging/views.py b/group_messaging/views.py
index d4d646ec..244762d1 100644
--- a/group_messaging/views.py
+++ b/group_messaging/views.py
@@ -10,7 +10,7 @@ and turns them into complete views
 """
 import copy
 import datetime
-from coffin.template.loader import get_template
+from django.template.loader import get_template
 from django.contrib.auth.models import User
 from django.db import models
 from django.forms import IntegerField