diff --git a/app/views/devise/mailer/_batch_invites.html.erb b/app/views/devise/mailer/_batch_invites.html.erb
new file mode 100644
index 000000000..e69de29bb
diff --git a/app/views/devise/mailer/_batch_invites.html.haml b/app/views/devise/mailer/_batch_invites.html.haml
index f0f4eb36c..e69de29bb 100644
--- a/app/views/devise/mailer/_batch_invites.html.haml
+++ b/app/views/devise/mailer/_batch_invites.html.haml
@@ -1,9 +0,0 @@
-%p
-  You have been invited to Diaspora, an open social web.  We are building an interface to the social web that keeps sharing intuitive while putting it in context, making it easy to know who you are sharing with.
-%p
-  We are elated to offer you a first glimpse of our Alpha release.
-  There still are bugs and missing features, but we are excited by the progress we have made in these short months.
-%p
-  We would love your feedback, as it is the users of Diaspora who must drive what it becomes.
-%p
-  For suggestions, feature requests, or bug reports, please use the "Feedback" link found on the left side of the page.
diff --git a/app/views/devise/mailer/invitation_instructions.html.haml b/app/views/devise/mailer/invitation_instructions.html.haml
index 73cc899dc..30787a802 100644
--- a/app/views/devise/mailer/invitation_instructions.html.haml
+++ b/app/views/devise/mailer/invitation_instructions.html.haml
@@ -1,22 +1,22 @@
-!!!
-%html
-  %head
-    %meta{"http-equiv"=>"Content-Type", :content=>"text/html; charset=utf-8"}/
-    = render :partial => 'notifier/notifier_css'
-  %body
-    %header
-      = image_tag AppConfig[:pod_url] + 'images/logo_caps.png'
-    #container
-      - @invs = @resource.invitations_to_me
-      %p
-        = t('devise.mailer.welcome', :email => @resource.email)
-      -if @invs.count > 0
-        = render :partial => 'inviters'
+-if @invs.count > 0
+  !!!
+    %html
+      %head
+        %meta{"http-equiv"=>"Content-Type", :content=>"text/html; charset=utf-8"}/
+        = render :partial => 'notifier/notifier_css'
+      %body
+        %header
+          = image_tag AppConfig[:pod_url] + 'images/logo_caps.png'
+        #container
+          - @invs = @resource.invitations_to_me
+          %p
+            = t('devise.mailer.welcome', :email => @resource.email)
+          = render :partial => 'inviters'
 
-      -else
-        = render :partial => 'batch_invites'
-      %p= link_to t('.accept'), accept_invitation_url(@resource, :invitation_token => @resource.invitation_token), :class => "large_text"
-      %p.small
-        = t('.ignore')
-        %br/
-        = t('.no_account_till')
+          %p= link_to t('.accept'), accept_invitation_url(@resource, :invitation_token => @resource.invitation_token), :class => "large_text"
+          %p.small
+            = t('.ignore')
+            %br/
+            = t('.no_account_till')
+-else
+  = render :partial => 'batch_invites'