diff --git a/app/views/users/edit.html.haml b/app/views/users/edit.html.haml
index 3175c1275d282acd185a7df8baa05774f1b2b05c..6f92f1ce71437746fe6b5bfca3a2c177ee0a1173 100644
--- a/app/views/users/edit.html.haml
+++ b/app/views/users/edit.html.haml
@@ -165,36 +165,35 @@
 
   .span-5.last
     %h3
-      = t('.close_account')
+      = t('.close_account_text')
     =link_to 'Close Account', '#close_account_pane', :rel => 'facebox', :class => "button"
 
     .hidden#close_account_pane{:rel => 'facebox'}
       #inner_account_delete
         %h1
-          Hey, please don't go!
+          = t('.close_account.dont_go')
         %p
-          We want you to help us make Diaspora better, so you should help us out instead of leaving.
-          if you do want to leave, we want you to know what happens next.
+          = t('.close_account.make_diaspora_better')
         .span-10
           = image_tag 'http://itstrulyrandom.com/wp-content/uploads/2008/03/sadcat.jpg'
           %br
           %small
             %b
-              Mr Wiggles will be sad to see you go
+              = t('.close_account.mr_wiggles')
         .span-10.last
           %ul
             %li
-              We delete all of your posts, profile data, as soon as humanly possible.
-              Your comments will hang around, but be associated with your Diaspora Handle.
+              = t('.close_account.what_we_delete')
             %li
-              You will get signed out and locked out of your account.
+              = t('.close_account.locked_out')
             %li
-              This will lock your username if you decided to sign back up.
+              = t('.close_account.lock_username')
             %li
-              Currently, there is no turning back
+              = t('.close_account.no_turning_back')
           %p
             %b
-              If you really want this, type in your password below and click 'Close Account'
+              = t('.close_account.no_turning_back')
+              
 
           = form_for 'user', :url => user_path, :html => { :method => :delete } do |f|
             = f.error_messages
@@ -203,4 +202,4 @@
               = f.label :close_account_password, t('.current_password'), :for => :close_account_password
               = f.password_field :current_password, :id => :close_account_password
             %p
-              = f.submit t('.close_account'), :confirm => t('are_you_sure_delete_account')
+              = f.submit t('.close_account_text'), :confirm => t('are_you_sure_delete_account')
diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml
index 21624ef2e1fc364b7f5282ea6d3ba7f5fc1ab234..6bd15c7fdb2474b58109402ef00d4e9f044ef1b2 100644
--- a/config/locales/diaspora/en.yml
+++ b/config/locales/diaspora/en.yml
@@ -932,7 +932,7 @@ en:
     edit:
       export_data: "Export Data"
       photo_export_unavailable: "Photo exporting currently unavailable"
-      close_account: "Close Account"
+      close_account_text: "Close Account"
       change_language: "Change language"
       change_password: "Change password"
       change_email: "Change email"
@@ -958,6 +958,16 @@ en:
       show_getting_started: 'Re-enable Getting Started'
       getting_started: 'New User Prefrences'
 
+      close_account:
+        dont_go: "Hey, please don't go!"
+        make_diaspora_better: "We want you to help us make Diaspora better, so you should help us out instead of leaving. If you do want to leave, we want you to know what happens next."
+        mr_wiggles: 'Mr Wiggles will be sad to see you go'
+        what_we_delete: "We delete all of your posts, profile data, as soon as humanly possible. Your comments will hang around, but be associated with your Diaspora Handle."
+        locked_out: "You will get signed out and locked out of your account."
+        lock_username: "This will lock your username if you decided to sign back up."
+        no_turning_back: "Currently, there is no turning back."
+        if_you_want_this: "If you really want this, type in your password below and click 'Close Account'"
+
     privacy_settings:
       title: "Privacy Settings"
       ignored_users: "Ignored Users"