diff --git a/gajim/chat_control.py b/gajim/chat_control.py
index 1a7a6e6d7..71533a620 100644
--- a/gajim/chat_control.py
+++ b/gajim/chat_control.py
@@ -314,20 +314,9 @@ class ChatControl(ChatControlBase):
             jingle.get_enabled() or httpupload.get_enabled())
 
         # Set File Transfer Button tooltip
-        ft_pref = app.config.get_per('accounts', self.account,
-                                     'filetransfer_preference')
-
-        tooltip_text = None
-        if httpupload.get_enabled() and jingle.get_enabled():
-            if ft_pref == 'httpupload':
-                tooltip_text = _('HTTP File Upload')
-            else:
-                tooltip_text = _('Jingle File Transfer')
-        elif httpupload.get_enabled():
-            tooltip_text = _('HTTP File Upload')
-        elif jingle.get_enabled():
-            tooltip_text = _('Jingle File Transfer')
-        elif online:
+        if online and (httpupload.get_enabled() or jingle.get_enabled()):
+            tooltip_text = _('Send File…')
+        else:
             tooltip_text = _('No File Transfer available')
         self.sendfile_button.set_tooltip_text(tooltip_text)
 
diff --git a/gajim/groupchat_control.py b/gajim/groupchat_control.py
index 58cca2fcb..8f91c0772 100644
--- a/gajim/groupchat_control.py
+++ b/gajim/groupchat_control.py
@@ -631,13 +631,10 @@ class GroupchatControl(ChatControlBase):
         win.lookup_action('send-file-' + self.control_id).set_enabled(
             httpupload.get_enabled())
 
-        tooltip_text = None
-        if online:
-            if httpupload.get_enabled():
-                tooltip_text = _('HTTP File Upload')
-            else:
-                tooltip_text = _('HTTP File Upload not supported '
-                                 'by your server')
+        if online and httpupload.get_enabled():
+            tooltip_text = _('Send File…')
+        else:
+            tooltip_text = _('No File Transfer available')
         self.sendfile_button.set_tooltip_text(tooltip_text)
 
     # Actions
diff --git a/gajim/gui_menu_builder.py b/gajim/gui_menu_builder.py
index ce1980fa5..4c58c620b 100644
--- a/gajim/gui_menu_builder.py
+++ b/gajim/gui_menu_builder.py
@@ -608,9 +608,9 @@ Build dynamic Application Menus
 
 def get_singlechat_menu(control_id):
     singlechat_menu = [
-        (_('Send File...'), [
-            ('win.send-file-httpupload-', 'HTTP Upload'),
-            ('win.send-file-jingle-', 'Jingle'),
+        (_('Send File…'), [
+            ('win.send-file-httpupload-', _('Upload File…')),
+            ('win.send-file-jingle-', _('Send File Directly…')),
             ]),
         ('win.invite-contacts-', _('Invite Contacts')),
         ('win.add-to-roster-', _('Add to Roster')),