diff --git a/src/freedombone b/src/freedombone
index a71f1742..f6d0454a 100755
--- a/src/freedombone
+++ b/src/freedombone
@@ -5355,9 +5355,48 @@ function spam_filtering {
   sed -i 's/# use_bayes 1/use_bayes 1/g' /etc/mail/spamassassin/local.cf
   sed -i 's/# bayes_auto_learn 1/bayes_auto_learn 1/g' /etc/mail/spamassassin/local.cf
 
+  # user preferences
+  if [ ! -d /home/$MY_USERNAME/.spamassassin ]; then
+      mkdir /home/$MY_USERNAME/.spamassassin
+      echo '# How many points before a mail is considered spam.' > /home/$MY_USERNAME/.spamassassin/user_prefs
+      echo '# required_score        5' >> /home/$MY_USERNAME/.spamassassin/user_prefs
+      echo '' >> /home/$MY_USERNAME/.spamassassin/user_prefs
+      echo '# Whitelist and blacklist addresses are now file-glob-style patterns, so' >> /home/$MY_USERNAME/.spamassassin/user_prefs
+      echo '# "friend@somewhere.com", "*@isp.com", or "*.domain.net" will all work.' >> /home/$MY_USERNAME/.spamassassin/user_prefs
+      echo '# whitelist_from    someone@somewhere.com' >> /home/$MY_USERNAME/.spamassassin/user_prefs
+      echo '' >> /home/$MY_USERNAME/.spamassassin/user_prefs
+      echo '# Add your own customised scores for some tests below.  The default scores are' >> /home/$MY_USERNAME/.spamassassin/user_prefs
+      echo '# read from the installed spamassassin rules files, but you can override them' >> /home/$MY_USERNAME/.spamassassin/user_prefs
+      echo '# here.  To see the list of tests and their default scores, go to' >> /home/$MY_USERNAME/.spamassassin/user_prefs
+      echo '# http://spamassassin.apache.org/tests.html .' >> /home/$MY_USERNAME/.spamassassin/user_prefs
+      echo '#' >> /home/$MY_USERNAME/.spamassassin/user_prefs
+      echo '# score SYMBOLIC_TEST_NAME n.nn' >> /home/$MY_USERNAME/.spamassassin/user_prefs
+      echo '' >> /home/$MY_USERNAME/.spamassassin/user_prefs
+      echo '# Speakers of Asian languages, like Chinese, Japanese and Korean, will almost' >> /home/$MY_USERNAME/.spamassassin/user_prefs
+      echo '# definitely want to uncomment the following lines.  They will switch off some' >> /home/$MY_USERNAME/.spamassassin/user_prefs
+      echo '# rules that detect 8-bit characters, which commonly trigger on mails using CJK' >> /home/$MY_USERNAME/.spamassassin/user_prefs
+      echo '# character sets, or that assume a western-style charset is in use. ' >> /home/$MY_USERNAME/.spamassassin/user_prefs
+      echo '# ' >> /home/$MY_USERNAME/.spamassassin/user_prefs
+      echo '# score HTML_COMMENT_8BITS  0' >> /home/$MY_USERNAME/.spamassassin/user_prefs
+      echo '# score UPPERCASE_25_50     0' >> /home/$MY_USERNAME/.spamassassin/user_prefs
+      echo '# score UPPERCASE_50_75     0' >> /home/$MY_USERNAME/.spamassassin/user_prefs
+      echo '# score UPPERCASE_75_100    0' >> /home/$MY_USERNAME/.spamassassin/user_prefs
+      echo '# score OBSCURED_EMAIL      0' >> /home/$MY_USERNAME/.spamassassin/user_prefs
+      echo '' >> /home/$MY_USERNAME/.spamassassin/user_prefs
+      echo '# Speakers of any language that uses non-English, accented characters may wish' >> /home/$MY_USERNAME/.spamassassin/user_prefs
+      echo '# to uncomment the following lines.   They turn off rules that fire on' >> /home/$MY_USERNAME/.spamassassin/user_prefs
+      echo '# misformatted messages generated by common mail apps in contravention of the' >> /home/$MY_USERNAME/.spamassassin/user_prefs
+      echo '# email RFCs.' >> /home/$MY_USERNAME/.spamassassin/user_prefs
+      echo '' >> /home/$MY_USERNAME/.spamassassin/user_prefs
+      echo '# score SUBJ_ILLEGAL_CHARS      0' >> /home/$MY_USERNAME/.spamassassin/user_prefs
+  fi
+  # this must be accessible by root
+  chown -R $MY_USERNAME:root /home/$MY_USERNAME/.spamassassin
+  
   service spamassassin restart
   service exim4 restart
   service cron restart
+  
   echo 'spam_filtering' >> $COMPLETION_FILE
 }
 
@@ -8328,11 +8367,11 @@ function install_mediagoblin {
   su -c "cd $MEDIAGOBLIN_PATH; ./bin/easy_install flup" - mediagoblin
   if [ -f $MEDIAGOBLIN_PATH/lib/python2.7/no-global-site-packages.txt ]; then
       virtualenv deactivate
-	  rm -f $MEDIAGOBLIN_PATH/lib/python2.7/no-global-site-packages.txt
+      rm -f $MEDIAGOBLIN_PATH/lib/python2.7/no-global-site-packages.txt
       su -c "cd $MEDIAGOBLIN_PATH; source bin/activate" - mediagoblin
   fi
   if [ -f $MEDIAGOBLIN_PATH/mediagoblin.example.ini ]; then
-	  # this is for versions > 0.7.1
+      # this is for versions > 0.7.1
       su -c "cp $MEDIAGOBLIN_PATH/mediagoblin.example.ini $MEDIAGOBLIN_PATH/mediagoblin_local.ini" - mediagoblin
       sed -i 's|# data_basedir.*|data_basedir = "/var/lib/mediagoblin"|g' $MEDIAGOBLIN_PATH/mediagoblin_local.ini
   else