diff --git a/fleacollar.sh b/fleacollar.sh
index ba41dbb..acc0769 100755
--- a/fleacollar.sh
+++ b/fleacollar.sh
@@ -160,7 +160,9 @@ EOF
             echo 'video/*; mpv --quiet --no-video %s; needsterminal' >> "$muttHome/mailcap"
     fi
     if ! [ -f "$muttHome/gpg.rc" ]; then
-        cp "/usr/share/doc/mutt/samples/gpg.rc" "$muttHome/"
+        if ! cp "/usr/share/doc/mutt/samples/gpg.rc" "$muttHome/" ; then
+            find /usr -name gpg.rc -exec  cp "{}" "$muttHome/" \; 2> /dev/null
+        fi
         echo "set pgp_autosign=yes" >> "$muttHome/gpg.rc"
         echo "set crypt_autosign=yes" >> "$muttHome/gpg.rc"
         echo "set pgp_replyencrypt=yes" >> "$muttHome/gpg.rc"
@@ -222,27 +224,29 @@ EOF
             "vim") echo "set editor = \"vim -c 'set spell spelllang=${LANG::2}'\"" > "$muttHome/muttrc";;
             *) echo "set editor = '$i'" > "$muttHome/muttrc";;
         esac
-        echo "set text_flowed=yes" >> "$muttHome/muttrc"
+        echo "set text_flowed = yes" >> "$muttHome/muttrc"
+        # Move the messge index number to the right edge.
+        echo "set index_format = '%Z %{%b %d} %-15.15L (%?l?%4l&%4c?) %s %4C'" >> "$muttHome/muttrc"
         # I need to figure out a way to detect and set the language for the next setting.
-        echo "set send_charset=us-ascii:utf-8" >> "$muttHome/muttrc"
+        echo "set send_charset = us-ascii:utf-8" >> "$muttHome/muttrc"
         echo "set pager = 'builtin'" >> "$muttHome/muttrc"
         echo "set pager_stop = 'yes'" >> "$muttHome/muttrc"
-        echo "set sort=threads" >> "$muttHome/muttrc"
-        echo "set beep_new=yes" >> "$muttHome/muttrc"
+        echo "set sort = threads" >> "$muttHome/muttrc"
+        echo "set beep_new = yes" >> "$muttHome/muttrc"
         echo "set display_filter = '$muttHome/scripts/add_address.sh'" >> "$muttHome/muttrc"
-        echo "set print=yes" >> "$muttHome/muttrc"
-        echo "set imap_check_subscribed" >> "$muttHome/muttrc"
-        echo "set sort_alias=alias" >> "$muttHome/muttrc"
-        echo "set reverse_alias=yes" >> "$muttHome/muttrc"
-        echo "set alias_file=${muttHome/#$HOME/\~}/aliases" >> "$muttHome/muttrc"
+        echo "set print = yes" >> "$muttHome/muttrc"
+        echo "set imap_check_subscribed = yes" >> "$muttHome/muttrc"
+        echo "set sort_alias = alias" >> "$muttHome/muttrc"
+        echo "set reverse_alias = yes" >> "$muttHome/muttrc"
+        echo "set alias_file = ${muttHome/#$HOME/\~}/aliases" >> "$muttHome/muttrc"
         echo "source ${muttHome/#$HOME/\~}/aliases" >> "$muttHome/muttrc"
-        echo "set history_file=${muttHome/#$HOME/\~}/history" >> "$muttHome/muttrc"
-        echo "set history=1024" >> "$muttHome/muttrc"
-        echo "set mailcap_path=${muttHome/#$HOME/\~}/mailcap" >> "$muttHome/muttrc"
-        echo "set header_cache=${muttHome/#$HOME/\~}/cache/headers" >> "$muttHome/muttrc"
-        echo "set message_cachedir=${muttHome/#$HOME/\~}/cache/bodies" >> "$muttHome/muttrc"
-        echo "set certificate_file=${muttHome/#$HOME/\~}/certificates" >> "$muttHome/muttrc"
-        echo "set markers=no" >> "$muttHome/muttrc"
+        echo "set history_file = ${muttHome/#$HOME/\~}/history" >> "$muttHome/muttrc"
+        echo "set history = 1024" >> "$muttHome/muttrc"
+        echo "set mailcap_path = ${muttHome/#$HOME/\~}/mailcap" >> "$muttHome/muttrc"
+        echo "set header_cache = ${muttHome/#$HOME/\~}/cache/headers" >> "$muttHome/muttrc"
+        echo "set message_cachedir = ${muttHome/#$HOME/\~}/cache/bodies" >> "$muttHome/muttrc"
+        echo "set certificate_file = ${muttHome/#$HOME/\~}/certificates" >> "$muttHome/muttrc"
+        echo "set markers = no" >> "$muttHome/muttrc"
         echo "unset mark_old" >> "$muttHome/muttrc"
         echo "auto_view text/html" >> "$muttHome/muttrc"
         echo "alternative_order text/plain text/enriched text/html" >> "$muttHome/muttrc"