diff --git a/tailbone/views/email.py b/tailbone/views/email.py
index d381907d..536bf6ed 100644
--- a/tailbone/views/email.py
+++ b/tailbone/views/email.py
@@ -381,7 +381,15 @@ class EmailPreview(View):
 
     def __init__(self, request):
         super(EmailPreview, self).__init__(request)
-        self.email_handler = self.get_handler()
+
+        if hasattr(self, 'get_handler'):
+            warnings.warn("defining a get_handler() method is deprecated; "
+                          "please use AppHandler.get_email_handler() instead",
+                          DeprecationWarning, stacklevel=2)
+            self.email_handler = get_handler()
+        else:
+            app = self.get_rattail_app()
+            self.email_handler = app.get_email_handler()
 
     @property
     def handler(self):
@@ -390,10 +398,6 @@ class EmailPreview(View):
                       DeprecationWarning, stacklevel=2)
         return self.email_handler
 
-    def get_handler(self):
-        app = self.get_rattail_app()
-        return app.get_email_handler()
-
     def __call__(self):
 
         # Forms submitted via POST are only used for sending emails.
@@ -416,10 +420,12 @@ class EmailPreview(View):
             key = self.request.POST.get('email_key')
             if key:
                 email = self.email_handler.get_email(key)
-                data = email.obtain_sample_data(self.request)
+
+                context = self.email_handler.make_context()
+                context.update(email.obtain_sample_data(self.request))
 
                 try:
-                    self.email_handler.send_message(email, data,
+                    self.email_handler.send_message(email, context,
                                                     subject_prefix="[PREVIEW] ",
                                                     to=[recipient],
                                                     cc=None, bcc=None)
@@ -433,8 +439,11 @@ class EmailPreview(View):
     def preview_template(self, key, type_):
         email = self.email_handler.get_email(key)
         template = email.get_template(type_)
-        data = email.obtain_sample_data(self.request)
-        self.request.response.text = template.render(**data)
+
+        context = self.email_handler.make_context()
+        context.update(email.obtain_sample_data(self.request))
+
+        self.request.response.text = template.render(**context)
         if type_ == 'txt':
             self.request.response.content_type = str('text/plain')
         return self.request.response