diff --git a/app/views/friends/index.rhtml b/app/views/friends/index.rhtml
index e595152..3c72ec7 100644
--- a/app/views/friends/index.rhtml
+++ b/app/views/friends/index.rhtml
@@ -37,7 +37,7 @@
 <% button_bar do %>
   <%= button(:back, _('Go back'), :controller => 'profile_editor') %>
   <%= button(:search, _('Find people'), :controller => 'search', :action => 'assets', :asset => 'people') %>
-  <%= button(:search, _('Invite friends from my e-mail contacts'), :action => 'invite') %>
+  <%= button(:search, _('Invite people from my e-mail contacts'), :action => 'invite') %>
 <% end %>
 
 </div><!-- end id="manage_friends" -->
diff --git a/app/views/friends/invite.rhtml b/app/views/friends/invite.rhtml
index 40cc805..197265f 100644
--- a/app/views/friends/invite.rhtml
+++ b/app/views/friends/invite.rhtml
@@ -3,21 +3,17 @@
 
 <% unless @friends %>
 
-  <h2><%= __('Step 1 of 1: Accessing your contact list') %></h2>
-
-  <p>
-  <%= __('Choose your webmail provider and enter your login and password so we can fetch your contact list. If you only want to invite specific people by listing their e-mail addresses, select the "Enter e-mail addresses manually" option.') %>
-  </p>
+  <h2><%= __('Step 1 of 1: Select address book') %></h2>
 
   <% form_tag do %>
     <%= hidden_field_tag(:import, 1) %>
 
-    <%= labelled_form_field(_('Select your e-mail provider:'), [
+    <%= [
+          radio_button_tag(:import_from, "manual", @import_from == "manual", :onclick => 'hide_invite_friend_login_password()') + content_tag('label', __('Manually (empty field)'), :for => "import_from_manual"),
           radio_button_tag(:import_from, "gmail", @import_from == "gmail", :onclick => 'show_invite_friend_login_password()') + content_tag('label', 'Gmail', :for => 'import_from_gmail'),
           radio_button_tag(:import_from, "yahoo", @import_from == "yahoo", :onclick => 'show_invite_friend_login_password()') + content_tag('label', 'Yahoo', :for => "import_from_yahoo"),
-          radio_button_tag(:import_from, "hotmail", @import_from == "hotmail", :onclick => 'show_invite_friend_login_password()') + content_tag('label', 'Hotmail', :for => "import_from_hotmail"),
-          radio_button_tag(:import_from, "manual", @import_from == "manual", :onclick => 'hide_invite_friend_login_password()') + content_tag('label', __('Enter e-mail addresses manually'), :for => "import_from_manual")
-        ].join("\n<br/>\n")) %>
+          radio_button_tag(:import_from, "hotmail", @import_from == "hotmail", :onclick => 'show_invite_friend_login_password()') + content_tag('label', 'Hotmail', :for => "import_from_hotmail")
+        ].join("\n<br/>\n") %>
 
     <script type="text/javascript">
       function hide_invite_friend_login_password() {
@@ -52,8 +48,7 @@
     <%= hidden_field_tag(:import_from, @import_from) %>
 
     <div>
-      <%= __("Enter one e-mail address per line, following the example below.")%>
-      <%= labelled_form_field(__('E-mail addresses'), text_area_tag(:manual_import_addresses, (@manual_import_addresses || __("Firstname Lastname <friend@email.com>")), :cols => 72, :rows => 5)) %>
+      <%= labelled_form_field(__('Enter one e-mail address per line:'), text_area_tag(:manual_import_addresses, (@manual_import_addresses || ''), :cols => 72, :rows => 5)) %>
     </div>
     <% if @import_from != 'manual' %>
       <div>
@@ -70,9 +65,10 @@
       </div>
     <% end -%>
 
+    <br/>
     <div>
       <%= h __("Now enter an invitation message. You must keep the <url> code in your invitation message. When your friends receive the invitation e-mail, <url> will be replaced by a link that they need to click to activate their account. <user> and <friend> codes will be replaced by your name and friend name, but they are optional.") %>
-      <%= labelled_form_field(__('Invitation message'), text_area_tag(:message, @message, :cols => 72, :rows => 8)) %>
+      <%= labelled_form_field(__('Invitation message:'), text_area_tag(:message, @message, :cols => 72, :rows => 8)) %>
     </div>
 
     <% button_bar do %>
--
libgit2 0.21.2