diff --git a/app/jobs/send_e_invoice_job.rb b/app/jobs/send_e_invoice_job.rb
index e69de29bb..e281db14d 100644
--- a/app/jobs/send_e_invoice_job.rb
+++ b/app/jobs/send_e_invoice_job.rb
@@ -0,0 +1,43 @@
+class SendEInvoiceJob < Que::Job
+  def run(invoice_id)
+    invoice = run_condition(Invoice.find_by(id: invoice_id))
+
+    invoice.to_e_invoice.deliver
+    ActiveRecord::Base.transaction do
+      invoice.update(e_invoice_sent_at: Time.zone.now)
+      log_success(invoice)
+      destroy
+    end
+  rescue StandardError => e
+    log_error(invoice: invoice, error: e)
+    raise e
+  end
+
+  private
+
+  def run_condition(invoice)
+    destroy unless invoice
+    destroy if invoice.do_not_send_e_invoice?
+    invoice
+  end
+
+  def log_success(invoice)
+    id = invoice.try(:id) || invoice
+    message = "E-Invoice for an invoice with ID # #{id} was sent successfully"
+    logger.info message
+  end
+
+  def log_error(invoice:, error:)
+    id = invoice.try(:id) || invoice
+    message = <<~TEXT.squish
+      There was an error sending e-invoice for invoice with ID # #{id}.
+      The error message was the following: #{error}
+      This job will retry.
+    TEXT
+    logger.error message
+  end
+
+  def logger
+    Rails.logger
+  end
+end
diff --git a/app/models/invoice.rb b/app/models/invoice.rb
index 7f1dea825..4b35b71fb 100644
--- a/app/models/invoice.rb
+++ b/app/models/invoice.rb
@@ -102,6 +102,14 @@ class Invoice < ApplicationRecord
     generator.generate
   end
 
+  def do_not_send_e_invoice?
+    e_invoice_sent? || cancelled? || paid?
+  end
+
+  def e_invoice_sent?
+    e_invoice_sent_at.present?
+  end
+
   private
 
   def apply_default_buyer_vat_no
@@ -111,4 +119,4 @@ class Invoice < ApplicationRecord
   def calculate_total
     self.total = subtotal + vat_amount
   end
-end
\ No newline at end of file
+end
diff --git a/app/models/registrar.rb b/app/models/registrar.rb
index 88aa1c629..f657cdc74 100644
--- a/app/models/registrar.rb
+++ b/app/models/registrar.rb
@@ -99,9 +99,7 @@ class Registrar < ApplicationRecord
         }
       ]
     )
-
-    e_invoice = invoice.to_e_invoice
-    e_invoice.deliver
+    SendEInvoiceJob.enqueue(invoice.id)
 
     invoice
   end
diff --git a/db/migrate/20200204103125_add_e_invoice_sent_at_to_invoice.rb b/db/migrate/20200204103125_add_e_invoice_sent_at_to_invoice.rb
new file mode 100644
index 000000000..e0e5f2cd0
--- /dev/null
+++ b/db/migrate/20200204103125_add_e_invoice_sent_at_to_invoice.rb
@@ -0,0 +1,5 @@
+class AddEInvoiceSentAtToInvoice < ActiveRecord::Migration[5.0]
+  def change
+    add_column :invoices, :e_invoice_sent_at, :datetime
+  end
+end
diff --git a/db/structure.sql b/db/structure.sql
index a23623bae..cd2998c07 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -886,6 +886,7 @@ CREATE TABLE public.invoices (
     in_directo boolean DEFAULT false,
     buyer_vat_no character varying,
     issue_date date NOT NULL,
+    e_invoice_sent_at timestamp without time zone,
     CONSTRAINT invoices_due_date_is_not_before_issue_date CHECK ((due_date >= issue_date))
 );
 
@@ -4339,6 +4340,7 @@ INSERT INTO "schema_migrations" (version) VALUES
 ('20191212133136'),
 ('20191227110904'),
 ('20200113091254'),
-('20200115102202');
+('20200115102202'),
+('20200204103125');
 
 
diff --git a/test/jobs/send_e_invoice_job_test.rb b/test/jobs/send_e_invoice_job_test.rb
new file mode 100644
index 000000000..384479e92
--- /dev/null
+++ b/test/jobs/send_e_invoice_job_test.rb
@@ -0,0 +1,47 @@
+require 'test_helper'
+
+class SendEInvoiceJobTest < ActiveSupport::TestCase
+
+  def teardown
+    EInvoice.provider = EInvoice::Providers::TestProvider.new
+    EInvoice::Providers::TestProvider.deliveries.clear
+  end
+
+  def test_if_invoice_is_sended
+    @invoice = invoices(:one)
+    EInvoice.provider = EInvoice::Providers::TestProvider.new
+    EInvoice::Providers::TestProvider.deliveries.clear
+
+    assert_nothing_raised do
+      SendEInvoiceJob.enqueue(@invoice.id)
+    end
+    @invoice.reload
+
+    assert_not @invoice.e_invoice_sent_at.blank?
+    assert_equal 1, EInvoice::Providers::TestProvider.deliveries.count
+  end
+
+  def test_if_invoice_sending_retries
+    @invoice = invoices(:one)
+    provider_config = { password: nil,
+                        test_mode: true }
+    EInvoice.provider = EInvoice::Providers::OmnivaProvider.new(provider_config)
+    stub_request(:get, "https://testfinance.post.ee/finance/erp/erpServices.wsdl").to_timeout
+
+    assert_raise HTTPClient::TimeoutError do
+      SendEInvoiceJob.enqueue(@invoice.id)
+    end
+    assert @invoicee_invoice_sent_at.blank?
+
+    EInvoice.provider = EInvoice::Providers::TestProvider.new
+    EInvoice::Providers::TestProvider.deliveries.clear
+
+    assert_nothing_raised do
+      SendEInvoiceJob.enqueue(@invoice.id)
+    end
+    @invoice.reload
+
+    assert_not @invoice.e_invoice_sent_at.blank?
+    assert_equal 1, EInvoice::Providers::TestProvider.deliveries.count
+  end
+end