diff --git a/emacs.el b/emacs.el
index 551e0ab..4c214ca 100644
--- a/emacs.el
+++ b/emacs.el
@@ -430,7 +430,6 @@ Otherwize hook it."
 (setq line-move-visual nil)
 (setq create-lockfiles nil)
 (setq set-mark-command-repeat-pop t)
-(setq-default fill-column 80)
 
 (add-hook 'before-save-hook
           'time-stamp)
@@ -610,6 +609,11 @@ THEM are function and its args."
                         ignoramus-file-basename-exact-names))
   )
 
+
+;; Fill column
+(setq-default fill-column 80)
+(add-hook 'text-mode-hook 'turn-on-auto-fill)
+
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; title and mode-line