 
     if emailsToSend and emailsToSend.count() > 0
       emailsToSend.forEach (letter) =>
+        
         Meteor.defer =>
           try
             Email.send
               from: if !!~@login.indexOf('@') then "<#{@login}> #{@accountName}" else "<#{@login}@#{@host}> #{@accountName}"
               to: letter.to
-              subject: letter.options.subject.replace /<(?:.|\n)*?>/gm, ''
-              html: @compileBody letter.options, letter.template
-            letter.callback and letter.callback null, true, letter.to
+              subject: letter.subject.replace /<(?:.|\n)*?>/gm, ''
+              html: @compileBody letter.helpers, letter.template
+
+            # letter.callback and letter.callback null, true, letter.to
             
             if @saveHistory
               mailQueue.update 


  queue: {}

  queueAdd: (to, options, callback, sendAt, template = null) ->
    _id = mailQueue.insert {to, options, sendAt, isSent: false, tries: 0, uid: @uid, template}
    @queueTry _id

  queueTry: (_id = false) ->

    @param  {String} lang    - [OPTIONAL] Language
    @param  {String} template- [OPTIONAL] Full path to template, like 'private/email_templates/name.html' 
  ###
  compileBody: (helpers={}, template) =>

    if template
      tmplt = SSR.compileTemplate '___MailerMail___', template
    else
      tmplt = SSR.compileTemplate '___MailerMail___', if not @template then @basicHTMLTempate else Assets.getText(@template)

    Template.___MailerMail___.helpers helpers

    SSR.render tmplt

