diff --git a/src/po/check.vim b/src/po/check.vim
index 917c64849..659a19605 100644
--- a/src/po/check.vim
+++ b/src/po/check.vim
@@ -226,6 +226,14 @@ elseif ctu
   " endif
 endif
 
+" Check that all lines are no longer than 80 chars
+let overlong = search('\%>80v', 'n')
+if overlong > 0
+  echomsg "Lines should be wrapped at 80 columns"
+  if error == 0
+    let error = overlong
+  endif
+endif
 
 if error == 0
   " If all was OK restore the view.