diff --git a/app/assets/javascripts/inbox.js b/app/assets/javascripts/inbox.js
index eed96cb21601643255fec59bc0e11aa3d050e664..c545f9c5d102e8190e9a65ea66e21beb4da62ad9 100644
--- a/app/assets/javascripts/inbox.js
+++ b/app/assets/javascripts/inbox.js
@@ -34,7 +34,7 @@ $(document).ready(function(){
     history.pushState(null, "", conversation_path);
 
     var conv = $(this).children('.stream_element'),
-        cBadge = $("#message_inbox_badge .badge_count");
+        cBadge = $("#conversations_badge .badge_count");
     if(conv.hasClass('unread') ){
       conv.removeClass('unread');
     }
diff --git a/app/assets/stylesheets/bootstrap-headerfix.sass b/app/assets/stylesheets/bootstrap-headerfix.sass
index 616dce1e6a0414813cef0fc4c808e75cc129fa28..d0b8cc72d4a2c5f888e573f6823caa7fa4a0db55 100644
--- a/app/assets/stylesheets/bootstrap-headerfix.sass
+++ b/app/assets/stylesheets/bootstrap-headerfix.sass
@@ -14,7 +14,7 @@ header
       font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif
       font-size: 13px
 
-  #message_inbox_badge, #notification_badge
+  #conversations_badge, #notification_badge
     background: none
   
 
diff --git a/app/assets/stylesheets/conversations.css.scss b/app/assets/stylesheets/conversations.css.scss
index 50de2fc690b5c46e58dce5c645d0301bd580baab..681a2cb08759ba05efacf4738f3bdbb0b19e3e5e 100644
--- a/app/assets/stylesheets/conversations.css.scss
+++ b/app/assets/stylesheets/conversations.css.scss
@@ -189,7 +189,7 @@
   font-size: 12px;
 }
 
-#new_message_pane {
+#new_conversation_pane {
   ul.as-selections { width: 100% !important; }
   input#contact_ids { box-shadow: none; }
   textarea { width: 98%; }
diff --git a/app/assets/stylesheets/header.css.scss b/app/assets/stylesheets/header.css.scss
index 74481ca66205970635d38eea18c5eb21edbe313b..fdcea9d6c371ddda25860221fd4f44f807020ac4 100644
--- a/app/assets/stylesheets/header.css.scss
+++ b/app/assets/stylesheets/header.css.scss
@@ -95,12 +95,12 @@ body > header {
       }
     }
 
-    #notification_badge, #message_inbox_badge {
+    #notification_badge, #conversations_badge {
       float: left;
       padding: 0px 3px;
     }
 
-    #message_inbox_badge {
+    #conversations_badge {
       padding-top: 3px;
       margin-right: 0px;
       padding-right: 0px;
diff --git a/app/assets/stylesheets/mobile.css.scss b/app/assets/stylesheets/mobile.css.scss
index 6124e1e81a6db3809e6b8ccf6e38d6ff2f1fa6fe..a9b90c429c655deb0d801be63ade6e8a7e83690f 100644
--- a/app/assets/stylesheets/mobile.css.scss
+++ b/app/assets/stylesheets/mobile.css.scss
@@ -770,7 +770,7 @@ display: inline-block;
   color: #3F8FBA;
 }
 
-form#new_message.new_message input.button.creation{
+form#new_conversation.new_message input.button.creation{
 	float: right;
 	margin: 0 5px 5px;
 }
diff --git a/app/assets/stylesheets/rtl.css.scss b/app/assets/stylesheets/rtl.css.scss
index ccf6b9abc28c4539a02bb2e57bbdbdee85bd9392..0cbfb9b8ce17f969646fb3033a7681edc8d864e6 100644
--- a/app/assets/stylesheets/rtl.css.scss
+++ b/app/assets/stylesheets/rtl.css.scss
@@ -20,7 +20,7 @@ body {
   float: right;
 }
 
-#notification_badge, #message_inbox_badge {
+#notification_badge, #conversations_badge {
   margin: 0 10px 0 -5px;
 }
 
@@ -42,11 +42,11 @@ body {
   margin-left: 3px;
 }
 
-#notification_badge, #message_inbox_badge {
+#notification_badge, #conversations_badge {
   margin: 0 10px 0 -5px;
 }
 
-#notification_badge a, #message_inbox_badge a {
+#notification_badge a, #conversations_badge a {
   right: 0;
 }
 
diff --git a/app/assets/templates/header_tpl.jst.hbs b/app/assets/templates/header_tpl.jst.hbs
index 5439cfab3a8a1121ccbcd8a95f93f02dba23d800..ea886f13dcd404f21f5f38e4652bedd3a9ce48f1 100644
--- a/app/assets/templates/header_tpl.jst.hbs
+++ b/app/assets/templates/header_tpl.jst.hbs
@@ -30,9 +30,9 @@
       </div>
     </div>
 
-    <div class="badge badge-inverse" id="message_inbox_badge">
+    <div class="badge badge-inverse" id="conversations_badge">
      <div class="icons-mail_grey" >
-        <a href="/conversations" title="{{t "header.messages"}}" class="badge_link" >
+        <a href="/conversations" title="{{t "header.conversations"}}" class="badge_link" >
           <div class="badge_count {{#unless current_user.unread_messages_count}} hidden {{/unless}}">
             {{current_user.unread_messages_count}}
           </div>
diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb
index c67abd197068360231cc721321bfc9dc7a0f5ca1..752ffd573c1d7d1988ee27612878f5abca8bfcf0 100644
--- a/app/controllers/messages_controller.rb
+++ b/app/controllers/messages_controller.rb
@@ -18,7 +18,7 @@ class MessagesController < ApplicationController
       Rails.logger.info("event=create type=comment user=#{current_user.diaspora_handle} status=success message=#{message.id} chars=#{params[:message][:text].length}")
       Postzord::Dispatcher.build(current_user, message).post
     else
-      flash[:error] = I18n.t('conversations.new_message.fail')
+      flash[:error] = I18n.t('conversations.new_conversation.fail')
     end
     redirect_to conversations_path(:conversation_id => conversation.id)
   end
diff --git a/app/views/conversations/index.haml b/app/views/conversations/index.haml
index 269a1c75bd36ded858296ca72d980954bb1296e5..5252844ecfbca288d4d49fef27630e0bc5b9c074 100644
--- a/app/views/conversations/index.haml
+++ b/app/views/conversations/index.haml
@@ -7,7 +7,7 @@
   = javascript_include_tag :inbox
 
 - content_for :page_title do
-  = t('.message_inbox')
+  = t('.conversations_inbox')
 
 .container-fluid.conversations_container
   .row-fluid
@@ -16,7 +16,7 @@
         #left_pane_header
           %h3
             .pull-right
-              = link_to t('.new_message'), new_conversation_path, :class => 'btn btn-default', :rel => 'facebox'
+              = link_to t('.new_conversation'), new_conversation_path, :class => 'btn btn-default', :rel => 'facebox'
             = t('.inbox')
 
         #conversation_inbox
@@ -38,4 +38,4 @@
             #no_conversation_text
               = t('.no_conversation_selected')
             #no_conversation_controls
-              = link_to t('.create_a_new_message'), new_conversation_path, :rel => 'facebox'
+              = link_to t('.create_a_new_conversation'), new_conversation_path, :rel => 'facebox'
diff --git a/app/views/conversations/index.mobile.haml b/app/views/conversations/index.mobile.haml
index 68ea4c8a7197acb4b7214f8b13ca71218474ccce..eb1f5f0ce865f2f755fa03e7d9a0a9e47d4272fa 100644
--- a/app/views/conversations/index.mobile.haml
+++ b/app/views/conversations/index.mobile.haml
@@ -3,7 +3,7 @@
 -#   the COPYRIGHT file.
 
 .right
-  = link_to t('.new_message'), new_conversation_path, :class => 'btn'
+  = link_to t('.new_conversation'), new_conversation_path, :class => 'btn'
 
 - flash.each do |name, msg|
   %div{:id => "flash_#{name}", :class => "expose"}
diff --git a/app/views/conversations/new.haml b/app/views/conversations/new.haml
index f15cf28188e1067eda685b84b94635f0a5690382..356fd1dd0cd759e5abb581c6502098638b287077 100644
--- a/app/views/conversations/new.haml
+++ b/app/views/conversations/new.haml
@@ -26,10 +26,10 @@
     autocompleteInput.focus();
   });
 
-.span6#new_message_pane
+.span6#new_conversation_pane
   .span5#facebox_header
     %h3
-      = t('conversations.index.new_message')
+      = t('conversations.index.new_conversation')
 
   = form_for Conversation.new, html: {class: "new_conversation form_do_not_clear"}, remote: true do |conversation|
 
diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml
index 8e1868fa21e7104e87a330f7d3ca36fad3e4ea9b..bede226efe3f99a6955c64e30290c751d40a9b32 100644
--- a/config/locales/diaspora/en.yml
+++ b/config/locales/diaspora/en.yml
@@ -327,10 +327,10 @@ en:
 
   conversations:
     index:
-      message_inbox: "Conversations – Inbox"
-      new_message: "New Message"
+      conversations_inbox: "Conversations – Inbox"
+      new_conversation: "New conversation"
       no_conversation_selected: "no conversation selected"
-      create_a_new_message: "create a new message"
+      create_a_new_conversation: "start a new conversation"
       no_messages: "no messages"
       inbox: "Inbox"
     conversation:
@@ -354,7 +354,7 @@ en:
       sent: "Message sent"
       fail: "Invalid message"
       no_contact: "Hey, you need to add the contact first!"
-    new_message:
+    new_conversation:
       fail: "Invalid message"
     destroy:
       success: "Conversation successfully removed"
diff --git a/config/locales/javascript/javascript.en.yml b/config/locales/javascript/javascript.en.yml
index a5ca291f84f6e16a002bc3c9cb429b518853d10f..5d65beb6cd68628d4056eafb47bbe1440322d6d0 100644
--- a/config/locales/javascript/javascript.en.yml
+++ b/config/locales/javascript/javascript.en.yml
@@ -150,7 +150,7 @@ en:
       log_out: "Log out"
 
       notifications: "Notifications"
-      messages: "Conversations"
+      conversations: "Conversations"
 
       search: "Search"
 
diff --git a/features/desktop/conversations.feature b/features/desktop/conversations.feature
index 99f27660092808c3f9e0e0d8b9151e20e02afd97..512b85090e21606145baf30bc1124bec23058807 100644
--- a/features/desktop/conversations.feature
+++ b/features/desktop/conversations.feature
@@ -1,5 +1,5 @@
 @javascript
-Feature: private messages
+Feature: private conversations
     In order to be talkative
     As a User
     I want to converse with people
diff --git a/features/mobile/conversations.feature b/features/mobile/conversations.feature
index f365c68cafbec6f1ef83e1f1df302e6c3d5ddfcf..9d7ae823e2554185de5bc0a979da52dd355c7bcb 100644
--- a/features/mobile/conversations.feature
+++ b/features/mobile/conversations.feature
@@ -1,5 +1,5 @@
 @javascript
-Feature: private messages mobile
+Feature: private conversations mobile
     In order to be talkative
     As a mobile user
     I want to converse with people
diff --git a/features/step_definitions/conversations_steps.rb b/features/step_definitions/conversations_steps.rb
index edf138ddc51f23c688da2c3a4b3111d469e7f290..e8f6b4a8bf35ba944f9dd4b93b74d782f760aa26 100644
--- a/features/step_definitions/conversations_steps.rb
+++ b/features/step_definitions/conversations_steps.rb
@@ -6,7 +6,7 @@ end
 
 Then /^I send a message with subject "([^"]*)" and text "([^"]*)" to "([^"]*)"$/ do |subject, text, person|
   step %(I am on the conversations page)
-  step %(I follow "New Message")
+  step %(I follow "New conversation")
   step %(I fill in "contact_autocomplete" with "#{person}" in the modal window)
   step %(I press the first ".as-result-item" within ".as-results" in the modal window)
   step %(I fill in "conversation_subject" with "#{subject}" in the modal window)
@@ -23,7 +23,7 @@ end
 
 Then /^I send a mobile message with subject "([^"]*)" and text "([^"]*)" to "([^"]*)"$/ do |subject, text, person|
   step %(I am on the conversations page)
-  step %(I follow "New Message")
+  step %(I follow "New conversation")
   step %(I fill in "contact_autocomplete" with "#{person}")
   step %(I press the first ".as-result-item" within ".as-results")
   step %(I fill in "conversation_subject" with "#{subject}")
diff --git a/spec/javascripts/app/views/header_view_spec.js b/spec/javascripts/app/views/header_view_spec.js
index 95c1575eeefa3a070b3117531db074f8010c6a75..f8825a2e61dd42a4b8ebd628096fc38f542bdfdb 100644
--- a/spec/javascripts/app/views/header_view_spec.js
+++ b/spec/javascripts/app/views/header_view_spec.js
@@ -24,18 +24,18 @@ describe("app.views.Header", function() {
       })
     })
 
-    context("messages badge", function(){
+    context("conversations badge", function(){
       it("displays a count when the current user has a notification", function(){
         loginAs(_.extend(this.userAttrs, {unread_messages_count : 1}))
         this.view.render();
-        expect(this.view.$("#message_inbox_badge .badge_count").hasClass('hidden')).toBe(false);
-        expect(this.view.$("#message_inbox_badge .badge_count").text()).toContain("1");
+        expect(this.view.$("#conversations_badge .badge_count").hasClass('hidden')).toBe(false);
+        expect(this.view.$("#conversations_badge .badge_count").text()).toContain("1");
       })
 
       it("does not display a count when the current user has a notification", function(){
         loginAs(_.extend(this.userAttrs, {unread_messages_count : 0}))
         this.view.render();
-        expect(this.view.$("#message_inbox_badge .badge_count").hasClass('hidden')).toBe(true);
+        expect(this.view.$("#conversations_badge .badge_count").hasClass('hidden')).toBe(true);
       })
     })