diff --git a/src/main/scala/util/Notifier.scala b/src/main/scala/util/Notifier.scala
index 4fc522f..15acb35 100644
--- a/src/main/scala/util/Notifier.scala
+++ b/src/main/scala/util/Notifier.scala
@@ -65,6 +65,8 @@
 
   def toNotify(r: RepositoryService.RepositoryInfo, issueId: Int, content: String)
       (msg: String => String)(implicit context: Context) = {
+    val database = Database(context.request.getServletContext)
+
     val f = future {
       val email = new HtmlEmail
       email.setHostName(smtp.host)
@@ -79,7 +81,7 @@
       email.setHtmlMsg(msg(view.Markdown.toHtml(content, r, false, true)))
 
       // TODO Can we use the Database Session in other than Transaction Filter?
-      Database(context.request.getServletContext) withSession {
+      database withSession {
         getIssue(r.owner, r.name, issueId.toString) foreach { issue =>
           email.setSubject(s"[${r.name}] ${issue.title} (#${issueId})")
           recipients(issue) {