diff --git a/config/app_config.yml.example b/config/app_config.yml.example
index 069823a05c8c1075ce7a546f9f2ff0be1142a1b4..deb69220eb3216982d79bfd5af52f9d31c6773d9 100644
--- a/config/app_config.yml.example
+++ b/config/app_config.yml.example
@@ -12,6 +12,13 @@ default:
   pubsub_server: 'https://pubsubhubbub.appspot.com/'
   mongo_host: 'localhost'
   mongo_port: 27017
+  smtp_address: 'smtp.example.com'
+  smtp_port: '587'
+  smtp_domain: 'mail.example.com'
+  smtp_authentication: 'plain'
+  smtp_username: 'no-reply@example.com'
+  smtp_password: 'secret'
+  
 
 development:
 
diff --git a/config/environments/development.rb b/config/environments/development.rb
index d848ad4e9943d0851d7bfea24d83602af9443a9f..063adbd1b94a32773977443ed9feaf18aac3d8db 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -24,15 +24,4 @@ Diaspora::Application.configure do
   config.active_support.deprecation = :log
   config.middleware.use MongoMapper::ClearDevMemory
   #config.threadsafe!
-  config.action_mailer.delivery_method = :smtp
-  config.action_mailer.default_url_options = {:host => APP_CONFIG[:terse_pod_url]}
-  config.action_mailer.smtp_settings = {
-    :address => APP_CONFIG[:smtp_address],
-    :port => APP_CONFIG[:smtp_port],
-    :domain => APP_CONFIG[:smtp_domain],
-    :authentication => APP_CONFIG[:smtp_authentication],
-    :user_name => APP_CONFIG[:smtp_username],
-    :password => APP_CONFIG[:smtp_password],
-    :enable_starttls_auto => true
-  }
 end
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 6b081b164741032c71c77e2e248b169175d2b9cc..bdeeea2495af893693ecf476f558f580d6585af2 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -48,15 +48,4 @@ Diaspora::Application.configure do
   config.i18n.fallbacks = true
   config.threadsafe!
 
-  config.action_mailer.delivery_method = :smtp
-  config.action_mailer.default_url_options = {:host => APP_CONFIG[:terse_pod_url]}
-  config.action_mailer.smtp_settings = {
-    :address => APP_CONFIG[:smtp_address],
-    :port => APP_CONFIG[:smtp_port],
-    :domain => APP_CONFIG[:smtp_domain],
-    :authentication => APP_CONFIG[:smtp_authentication],
-    :user_name => APP_CONFIG[:smtp_username],
-    :password => APP_CONFIG[:smtp_password],
-    :enable_starttls_auto => true
-  }
 end
diff --git a/config/initializers/mailer_config.rb b/config/initializers/mailer_config.rb
new file mode 100644
index 0000000000000000000000000000000000000000..823a369fe21f79cf488cb7e81dc5eb0907c9ec83
--- /dev/null
+++ b/config/initializers/mailer_config.rb
@@ -0,0 +1,17 @@
+#   Copyright (c) 2010, Diaspora Inc.  This file is
+#   licensed under the Affero General Public License version 3.  See
+#   the COPYRIGHT file.
+
+Diaspora::Application.configure do
+  config.action_mailer.delivery_method = :smtp
+  config.action_mailer.default_url_options = {:host => APP_CONFIG[:terse_pod_url]}
+  config.action_mailer.smtp_settings = {
+    :address => APP_CONFIG[:smtp_address],
+    :port => APP_CONFIG[:smtp_port],
+    :domain => APP_CONFIG[:smtp_domain],
+    :authentication => APP_CONFIG[:smtp_authentication],
+    :user_name => APP_CONFIG[:smtp_username],
+    :password => APP_CONFIG[:smtp_password],
+    :enable_starttls_auto => true
+  }
+end
diff --git a/lib/diaspora/exporter.rb b/lib/diaspora/exporter.rb
index 106c94bb0d5bfc52184b1c61a31a86488e0d5b21..f23ed7681d4096a8676f5498359eac9ed644c13b 100644
--- a/lib/diaspora/exporter.rb
+++ b/lib/diaspora/exporter.rb
@@ -16,9 +16,9 @@ module Diaspora
         builder = Nokogiri::XML::Builder.new do |xml|
           xml.user {
             xml.username user.username
-            xml.serialized_private_key user.serialized_private_key 
             xml.parent << user.person.to_xml
-
+            xml.serialized_private_key user.serialized_private_key 
+            
             xml.aspects {
               user.aspects.each do |aspect|
                 xml.aspect {