diff --git a/autoload/jsx_pretty/indent.vim b/autoload/jsx_pretty/indent.vim
index 9dd0e5b..d37d399 100644
--- a/autoload/jsx_pretty/indent.vim
+++ b/autoload/jsx_pretty/indent.vim
@@ -124,6 +124,8 @@ function! jsx_pretty#indent#get(js_indent)
         else
           return prev_ind
         endif
+      elseif prev_line =~ '^\<return'
+        return prev_ind
       else
         return prev_ind - s:sw()
       endif
@@ -188,6 +190,13 @@ function! jsx_pretty#indent#get(js_indent)
   else
     let ind = a:js_indent()
 
+    " Issue #68
+    " return (<div>
+    " |<div>)
+    if prev_line =~ '^\<return' && line =~ '^<\s*' . s:end_tag
+      return prev_ind
+    endif 
+
     " If current syntax is not a jsx syntax group
     if s:syn_xmlish(prev_syn_eol) && line !~ '^[)\]}]'
       let sol = matchstr(line, s:opfirst)
diff --git a/syntax/gitcommit.vim b/syntax/gitcommit.vim
index 6bf3119..10aa7a1 100644
--- a/syntax/gitcommit.vim
+++ b/syntax/gitcommit.vim
@@ -22,7 +22,7 @@ endif
 syn include @gitcommitDiff syntax/diff.vim
 syn region gitcommitDiff start=/\%(^diff --\%(git\|cc\|combined\) \)\@=/ end=/^\%(diff --\|$\|#\)\@=/ fold contains=@gitcommitDiff
 
-syn match   gitcommitSummary	".*\%<50v" contained containedin=gitcommitFirstLine nextgroup=gitcommitOverflow contains=@Spell
+syn match   gitcommitSummary	"^.*\%<51v." contained containedin=gitcommitFirstLine nextgroup=gitcommitOverflow contains=@Spell
 syn match   gitcommitOverflow	".*" contained contains=@Spell
 syn match   gitcommitBlank	"^[^#].*" contained contains=@Spell