       Logger.log "Finished processing message with ID '%s'", messageId
 
     # delete the scheduled butler mail, because we couldn't find the real message
-    @deleteButlerMail messageId # pass "" + x in case messageId is undefined (should not happen)
+    @DB.remove props # pass "" + x in case messageId is undefined (should not happen)
     return
 
   # Get a label or create it

  butler = new MailButler request.parameter.callback

  switch request.parameter.action
    when 'schedule'
      out = butler.scheduleJson request.parameter
    when 'setup'

    @getLabel(name, false)?.removeFromThread thread
    return

  @storeButlerMail: (props) ->
    props.user    = @getEmail()
    props.version = @VERSION
    props.type    = @TYPE

    @DB.save props
    return

  addButlerMail: (form) ->
