diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 59f49f11a..02fad11e9 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -178,6 +178,7 @@ module ApplicationHelper
     message = process_autolinks(message)
     message = process_emphasis(message)
     message = process_youtube_again(message, options[:youtube_maps])
+    message = process_vimeo(message, options[:vimeo_maps])
 
     if options[:newlines]
       message.gsub!(/\n+/, '<br />')
@@ -245,13 +246,28 @@ module ApplicationHelper
       if youtube_maps && youtube_maps[video_id]
         title = youtube_maps[video_id]
       else
-        title = I18n.t 'application.helper.youtube_title.unknown'
+        title = I18n.t 'application.helper.video_title.unknown'
       end
       message.gsub!('youtube.com::'+video_id, '<a class="video-link" data-host="youtube.com" data-video-id="' + video_id + '" href="#video">Youtube: ' + title + '</a>')
     end
     return message
   end
 
+
+  def process_vimeo(message, vimeo_maps)
+    regex = /https?:\/\/(?:w{3}\.)?vimeo.com\/(\d{6,})/
+    while vimeo = message.match(regex)
+      video_id = vimeo[1]
+      if vimeo_maps && vimeo_maps[video_id]
+        title = vimeo_maps[video_id]
+      else
+        title = I18n.t 'application.helper.video_title.unknown'
+      end
+      message.gsub!(vimeo[0], '<a class="video-link" data-host="vimeo.com" data-video-id="' + video_id + '" href="#video">Youtube: ' + title + '</a>')
+    end
+    return message
+  end
+
   def info_text(text)
     image_tag 'icons/monotone_question.png', :class => 'what_is_this', :title => text
   end
diff --git a/config/locales/diaspora/ar.yml b/config/locales/diaspora/ar.yml
index b751c8fda..3c2ebb33d 100644
--- a/config/locales/diaspora/ar.yml
+++ b/config/locales/diaspora/ar.yml
@@ -30,7 +30,7 @@ ar:
       aspect_badge: 
         all_aspects: "All aspects"
       unknown_person: "شخص غير معروف"
-      youtube_title: 
+      video_title: 
         unknown: "Unknown Video Title"
   are_you_sure: "Are you sure?"
   aspects: 
diff --git a/config/locales/diaspora/ca.yml b/config/locales/diaspora/ca.yml
index c75d8be15..57217b7f6 100644
--- a/config/locales/diaspora/ca.yml
+++ b/config/locales/diaspora/ca.yml
@@ -30,7 +30,7 @@ ca:
       aspect_badge: 
         all_aspects: "All aspects"
       unknown_person: "persona desconeguda"
-      youtube_title: 
+      video_title: 
         unknown: "Títol desconegut de vídeo"
   are_you_sure: "Are you sure?"
   aspects: 
diff --git a/config/locales/diaspora/cs.yml b/config/locales/diaspora/cs.yml
index 6c013d07a..b3037bd86 100644
--- a/config/locales/diaspora/cs.yml
+++ b/config/locales/diaspora/cs.yml
@@ -30,7 +30,7 @@ cs:
       aspect_badge: 
         all_aspects: "All aspects"
       unknown_person: "neznámá osoba"
-      youtube_title: 
+      video_title: 
         unknown: "Unknown Video Title"
   are_you_sure: "Are you sure?"
   aspects: 
diff --git a/config/locales/diaspora/cy.yml b/config/locales/diaspora/cy.yml
index f5c661655..3c98269d7 100644
--- a/config/locales/diaspora/cy.yml
+++ b/config/locales/diaspora/cy.yml
@@ -30,7 +30,7 @@ cy:
       aspect_badge: 
         all_aspects: "All aspects"
       unknown_person: "unknown person"
-      youtube_title: 
+      video_title: 
         unknown: "Unknown Video Title"
   are_you_sure: "Are you sure?"
   aspects: 
diff --git a/config/locales/diaspora/da.yml b/config/locales/diaspora/da.yml
index 5c6d5b1f2..388cda629 100644
--- a/config/locales/diaspora/da.yml
+++ b/config/locales/diaspora/da.yml
@@ -30,7 +30,7 @@ da:
       aspect_badge: 
         all_aspects: "Alle aspekter"
       unknown_person: "ukendt person"
-      youtube_title: 
+      video_title: 
         unknown: "Ukendt videotitel"
   are_you_sure: "Er du sikker?"
   aspects: 
diff --git a/config/locales/diaspora/de.yml b/config/locales/diaspora/de.yml
index a4c7f09f6..ef5cb285c 100644
--- a/config/locales/diaspora/de.yml
+++ b/config/locales/diaspora/de.yml
@@ -30,7 +30,7 @@ de:
       aspect_badge: 
         all_aspects: "Alle Aspekte"
       unknown_person: "unbekannte Person"
-      youtube_title: 
+      video_title: 
         unknown: "Unbekannter Video-Titel"
   are_you_sure: "Bist du sicher?"
   aspects: 
diff --git a/config/locales/diaspora/el.yml b/config/locales/diaspora/el.yml
index 31786d20c..32f84ad40 100644
--- a/config/locales/diaspora/el.yml
+++ b/config/locales/diaspora/el.yml
@@ -30,7 +30,7 @@ el:
       aspect_badge: 
         all_aspects: "All aspects"
       unknown_person: "άγνωστο άτομο"
-      youtube_title: 
+      video_title: 
         unknown: "αγνώστος τίτλος αρχείου πολυμέσων"
   are_you_sure: "Are you sure?"
   aspects: 
diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml
index 5b0ee8872..1d8b27178 100644
--- a/config/locales/diaspora/en.yml
+++ b/config/locales/diaspora/en.yml
@@ -60,7 +60,7 @@ en:
   application:
       helper:
           unknown_person: "unknown person"
-          youtube_title:
+          video_title:
               unknown: "Unknown Video Title"
           aspect_badge:
               all_aspects: "All aspects"
diff --git a/config/locales/diaspora/eo.yml b/config/locales/diaspora/eo.yml
index e5643550a..0e185ea1c 100644
--- a/config/locales/diaspora/eo.yml
+++ b/config/locales/diaspora/eo.yml
@@ -30,7 +30,7 @@ eo:
       aspect_badge: 
         all_aspects: "All aspects"
       unknown_person: "unknown person"
-      youtube_title: 
+      video_title:
         unknown: "Unknown Video Title"
   are_you_sure: "Are you sure?"
   aspects: 
diff --git a/config/locales/diaspora/es-CL.yml b/config/locales/diaspora/es-CL.yml
index 0ba4516ef..bf3ad49bf 100644
--- a/config/locales/diaspora/es-CL.yml
+++ b/config/locales/diaspora/es-CL.yml
@@ -30,7 +30,7 @@ es-CL:
       aspect_badge: 
         all_aspects: "All aspects"
       unknown_person: "persona desconocida"
-      youtube_title: 
+      video_title:
         unknown: "Titulo del video desconocido"
   are_you_sure: "¿Estás seguro?"
   aspects: 
diff --git a/config/locales/diaspora/es.yml b/config/locales/diaspora/es.yml
index e53e8d016..9a5e9aa09 100644
--- a/config/locales/diaspora/es.yml
+++ b/config/locales/diaspora/es.yml
@@ -30,7 +30,7 @@ es:
       aspect_badge: 
         all_aspects: "All aspects"
       unknown_person: "persona desconocida"
-      youtube_title: 
+      video_title:
         unknown: "Título Desconocido de Vídeo"
   are_you_sure: "¿Estás seguro?"
   aspects: 
diff --git a/config/locales/diaspora/fi.yml b/config/locales/diaspora/fi.yml
index 789a67303..2c47445f5 100644
--- a/config/locales/diaspora/fi.yml
+++ b/config/locales/diaspora/fi.yml
@@ -30,7 +30,7 @@ fi:
       aspect_badge: 
         all_aspects: "All aspects"
       unknown_person: "tuntematon persoona"
-      youtube_title: 
+      video_title:
         unknown: "Videon otsikko tuntematon"
   are_you_sure: "Oletko varma?"
   aspects: 
diff --git a/config/locales/diaspora/fr.yml b/config/locales/diaspora/fr.yml
index 498d868df..f82e085f7 100644
--- a/config/locales/diaspora/fr.yml
+++ b/config/locales/diaspora/fr.yml
@@ -30,7 +30,7 @@ fr:
       aspect_badge: 
         all_aspects: "Tous les aspects"
       unknown_person: "personne inconnue"
-      youtube_title: 
+      video_title:
         unknown: "Titre de vidéo inconnu"
   are_you_sure: "Vous confirmez ?"
   aspects: 
diff --git a/config/locales/diaspora/he.yml b/config/locales/diaspora/he.yml
index a6739503a..ba19ba892 100644
--- a/config/locales/diaspora/he.yml
+++ b/config/locales/diaspora/he.yml
@@ -30,7 +30,7 @@ he:
       aspect_badge: 
         all_aspects: "כל ההיבטים"
       unknown_person: "אדם לא ידוע"
-      youtube_title: 
+      video_title:
         unknown: "כותרת הווידאו אינה ידועה"
   are_you_sure: "בבטחה?"
   aspects: 
diff --git a/config/locales/diaspora/hu.yml b/config/locales/diaspora/hu.yml
index 8f29f3f03..9b64a8b00 100644
--- a/config/locales/diaspora/hu.yml
+++ b/config/locales/diaspora/hu.yml
@@ -30,7 +30,7 @@ hu:
       aspect_badge: 
         all_aspects: "All aspects"
       unknown_person: "ismeretlen személy"
-      youtube_title: 
+      video_title:
         unknown: "Ismeretlen videó cím"
   are_you_sure: "Biztos vagy benne?"
   aspects: 
diff --git a/config/locales/diaspora/id.yml b/config/locales/diaspora/id.yml
index 1dabc2080..b99008df4 100644
--- a/config/locales/diaspora/id.yml
+++ b/config/locales/diaspora/id.yml
@@ -30,7 +30,7 @@ id:
       aspect_badge: 
         all_aspects: "All aspects"
       unknown_person: "orang tak dikenal"
-      youtube_title: 
+      video_title:
         unknown: "Unknown Video Title"
   are_you_sure: "Are you sure?"
   aspects: 
diff --git a/config/locales/diaspora/it.yml b/config/locales/diaspora/it.yml
index dfdb28404..29eb74f88 100644
--- a/config/locales/diaspora/it.yml
+++ b/config/locales/diaspora/it.yml
@@ -30,7 +30,7 @@ it:
       aspect_badge: 
         all_aspects: "Tutti gli aspetti"
       unknown_person: "persona sconosciuta"
-      youtube_title: 
+      video_title:
         unknown: "Titolo Video Sconosciuto"
   are_you_sure: "Sei sicuro?"
   aspects: 
diff --git a/config/locales/diaspora/lt.yml b/config/locales/diaspora/lt.yml
index 2e229260b..090e8801f 100644
--- a/config/locales/diaspora/lt.yml
+++ b/config/locales/diaspora/lt.yml
@@ -30,7 +30,7 @@ lt:
       aspect_badge: 
         all_aspects: "All aspects"
       unknown_person: "nežinomas asmuo"
-      youtube_title: 
+      video_title:
         unknown: "Nežinomas video pavadinimas"
   are_you_sure: "Are you sure?"
   aspects: 
diff --git a/config/locales/diaspora/mk.yml b/config/locales/diaspora/mk.yml
index 5f53c6f50..5c6239e15 100644
--- a/config/locales/diaspora/mk.yml
+++ b/config/locales/diaspora/mk.yml
@@ -30,7 +30,7 @@ mk:
       aspect_badge: 
         all_aspects: "All aspects"
       unknown_person: "непозната личност"
-      youtube_title: 
+      video_title:
         unknown: "Непознато име на видео"
   are_you_sure: "Are you sure?"
   aspects: 
diff --git a/config/locales/diaspora/nb.yml b/config/locales/diaspora/nb.yml
index f57545646..3fb1211ea 100644
--- a/config/locales/diaspora/nb.yml
+++ b/config/locales/diaspora/nb.yml
@@ -30,7 +30,7 @@ nb:
       aspect_badge: 
         all_aspects: "All aspects"
       unknown_person: "ukjent person"
-      youtube_title: 
+      video_title:
         unknown: "Unknown Video Title"
   are_you_sure: "Are you sure?"
   aspects: 
diff --git a/config/locales/diaspora/nl.yml b/config/locales/diaspora/nl.yml
index 469e877f7..6f24abb28 100644
--- a/config/locales/diaspora/nl.yml
+++ b/config/locales/diaspora/nl.yml
@@ -30,7 +30,7 @@ nl:
       aspect_badge: 
         all_aspects: "All aspects"
       unknown_person: "onbekend persoon"
-      youtube_title: 
+      video_title:
         unknown: "Onbekende video titel"
   are_you_sure: "Weet je het zeker?"
   aspects: 
diff --git a/config/locales/diaspora/pl.yml b/config/locales/diaspora/pl.yml
index 986bb6912..5f16815f7 100644
--- a/config/locales/diaspora/pl.yml
+++ b/config/locales/diaspora/pl.yml
@@ -30,7 +30,7 @@ pl:
       aspect_badge: 
         all_aspects: "All aspects"
       unknown_person: "nieznana osoba"
-      youtube_title: 
+      video_title:
         unknown: "Nieznany tytuł wideo"
   are_you_sure: "Na pewno?"
   aspects: 
diff --git a/config/locales/diaspora/pt-BR.yml b/config/locales/diaspora/pt-BR.yml
index 598d8019f..774680bc8 100644
--- a/config/locales/diaspora/pt-BR.yml
+++ b/config/locales/diaspora/pt-BR.yml
@@ -30,7 +30,7 @@ pt-BR:
       aspect_badge: 
         all_aspects: "All aspects"
       unknown_person: "pessoa desconhecida"
-      youtube_title: 
+      video_title:
         unknown: "Título de vídeo desconhecido"
   are_you_sure: "Are you sure?"
   aspects: 
diff --git a/config/locales/diaspora/pt-PT.yml b/config/locales/diaspora/pt-PT.yml
index 05dd8b2a9..e968be3c4 100644
--- a/config/locales/diaspora/pt-PT.yml
+++ b/config/locales/diaspora/pt-PT.yml
@@ -30,7 +30,7 @@ pt-PT:
       aspect_badge: 
         all_aspects: "All aspects"
       unknown_person: "utilizador(a) desconhecido(a)"
-      youtube_title: 
+      video_title:
         unknown: "Título do Vídeo Desconhecido"
   are_you_sure: "Are you sure?"
   aspects: 
diff --git a/config/locales/diaspora/ro.yml b/config/locales/diaspora/ro.yml
index 736fda7db..ab1441090 100644
--- a/config/locales/diaspora/ro.yml
+++ b/config/locales/diaspora/ro.yml
@@ -30,7 +30,7 @@ ro:
       aspect_badge: 
         all_aspects: "All aspects"
       unknown_person: "persoană necunoscută"
-      youtube_title: 
+      video_title:
         unknown: "Unknown Video Title"
   are_you_sure: "Are you sure?"
   aspects: 
diff --git a/config/locales/diaspora/ru.yml b/config/locales/diaspora/ru.yml
index 37dde6d13..ecdfdf422 100644
--- a/config/locales/diaspora/ru.yml
+++ b/config/locales/diaspora/ru.yml
@@ -30,7 +30,7 @@ ru:
       aspect_badge: 
         all_aspects: "All aspects"
       unknown_person: "неизвестная персона"
-      youtube_title: 
+      video_title:
         unknown: "Неизвестный видео заголовок"
   are_you_sure: "Вы уверены?"
   aspects: 
diff --git a/config/locales/diaspora/sk.yml b/config/locales/diaspora/sk.yml
index fae7937c2..2ed32764e 100644
--- a/config/locales/diaspora/sk.yml
+++ b/config/locales/diaspora/sk.yml
@@ -30,7 +30,7 @@ sk:
       aspect_badge: 
         all_aspects: "All aspects"
       unknown_person: "neznáma osoba"
-      youtube_title: 
+      video_title:
         unknown: "Názov videa neznámy"
   are_you_sure: "Are you sure?"
   aspects: 
diff --git a/config/locales/diaspora/sv.yml b/config/locales/diaspora/sv.yml
index 7b70a3d7c..b761601ea 100644
--- a/config/locales/diaspora/sv.yml
+++ b/config/locales/diaspora/sv.yml
@@ -30,7 +30,7 @@ sv:
       aspect_badge: 
         all_aspects: "Alla sidor"
       unknown_person: "okänd person"
-      youtube_title: 
+      video_title:
         unknown: "Okänd videotitel"
   are_you_sure: "Är du säker?"
   aspects: 
diff --git a/config/locales/diaspora/tr.yml b/config/locales/diaspora/tr.yml
index 5ef048db1..6b1154d45 100644
--- a/config/locales/diaspora/tr.yml
+++ b/config/locales/diaspora/tr.yml
@@ -30,7 +30,7 @@ tr:
       aspect_badge: 
         all_aspects: "All aspects"
       unknown_person: "bilinmiyen kişiler"
-      youtube_title: 
+      video_title:
         unknown: "Bilinmeyen Video Başlığı"
   are_you_sure: "Are you sure?"
   aspects: 
diff --git a/spec/helpers/application_helper_spec.rb b/spec/helpers/application_helper_spec.rb
index 936264916..5b54bc9d1 100644
--- a/spec/helpers/application_helper_spec.rb
+++ b/spec/helpers/application_helper_spec.rb
@@ -73,6 +73,14 @@ describe ApplicationHelper do
       end
 
       describe "video links" do
+        it "recognizes vimeo links" do
+          video_id = "17449557"
+          url = "http://www.vimeo.com/#{video_id}"
+          res = markdownify(url)
+          res.should =~ /data-host="vimeo.com"/
+          res.should =~ /data-video-id="#{video_id}"/
+        end
+
         it "recognizes youtube links" do
           video_id = "0x__dDWdf23"
           url = "http://www.youtube.com/watch?v=" + video_id + "&a=GxdCwVVULXdvEBKmx_f5ywvZ0zZHHHDU&list=ML&playnext=1"