diff --git a/.bash_aliases b/.bash_aliases
index 269f311..f8d3401 100644
--- a/.bash_aliases
+++ b/.bash_aliases
@@ -8,8 +8,8 @@ alias d='ls -al | egrep ^d'
 alias dl='ls -al | egrep "^[d|l]"'
 alias ll='ls -alh'
 alias h=history
-alias td='todo -c --force-colour --filter -done,+children | less -r'
-alias tdall='todo --force-colour -A|less -r'
+alias td='todo -c --force-colour --filter -done,+children | less -RF'
+alias tdall='todo --force-colour -A|less -RF'
 alias pp='python -mjson.tool'
 alias cd='cd -P'
 alias x='chmod +x'
@@ -52,7 +52,7 @@ alias revln='find . -xdev  -type l -exec echo -n "{} -> " \; -exec readlink  {}
 # alias seed='run-mailcap --norun --debug'
 alias edit='run-mailcap --action=edit'
 
-alias lf='/bin/ls -rt1|tail -1'
+alias lastf='/bin/ls -rt1|tail -1'
 alias slf='run-mailcap  "$(/bin/ls -rt1|tail -1)"'
 alias vlf='edit "$(/usr/bin/ls -rt1|tail -1)"'
 
@@ -70,6 +70,9 @@ alias cm='cd ~/.mutt'
 alias vm='vim ~/.mutt/muttrc'
 alias vma='vim ~/.mutt/alias'
 
+# urlscan
+alias vurl='vim ~/.config/urlscan/config.json'
+
 # w3m
 alias vw='vim ~/.w3m/config'
 
diff --git a/muttrc b/muttrc
index 7aadf86..f8e7fcb 100644
--- a/muttrc
+++ b/muttrc
@@ -90,9 +90,9 @@ bind pager <down>	half-down
 macro index .r ":source ~/.mutt/muttrc<enter>" "Reload muttrc"
 macro index <esc>T <untag-pattern>
 
-# urlscan/urlview
-# FIXME BROKEN macro index,pager \cb "<pipe-message>urlscan<enter>" "open URL in urlscan"
-macro index,pager \cb "<pipe-message>urlview<enter>" "open URL in urlview"
+# urlscan
+macro index,pager \cb "<pipe-message>urlscan<enter>" "open URL in urlscan"
+macro attach,compose \cb "<pipe-entry> urlscan<Enter>" "call urlscan to extract URLs out of a message"
 
 # save messages
 macro index >I <tag-prefix><save-message>=SERVICE.INFO<enter> 'save to service info'