diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index e0eb0642900..9c0c4ef8a65 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -706,7 +706,7 @@ en:
       subject_template: "[%{site_name}] Forum Activity for %{date}"
       new_activity: "New activity on your topics and posts:"
       new_topics: "New topics:"
-      unsubscribe: "This summary email is sent as a courtesy notification from %{site_link} when we haven't seen you for 7 days.\nIf you'd like to turn it off or change your email preferences, %{unsubscribe_link}."
+      unsubscribe: "This summary email is sent as a courtesy notification from %{site_link} when we haven't seen you in a while.\nIf you'd like to turn it off or change your email preferences, %{unsubscribe_link}."
 
     private_message:
       subject_template: "[%{site_name}] %{subject_prefix}%{topic_title}"
diff --git a/lib/site_setting_extension.rb b/lib/site_setting_extension.rb
index 2ed500b9361..eeb008bcb11 100644
--- a/lib/site_setting_extension.rb
+++ b/lib/site_setting_extension.rb
@@ -19,7 +19,7 @@ module SiteSettingExtension
     @defaults ||= {}
   end
 
-  def setting(name, default = nil, type = nil)
+  def setting(name, default = nil)
     mutex.synchronize do
       self.defaults[name] = default
       current_value = current.has_key?(name) ? current[name] : default
@@ -28,7 +28,7 @@ module SiteSettingExtension
   end
 
   # just like a setting, except that it is available in javascript via DiscourseSession
-  def client_setting(name, default = nil, type = nil)
+  def client_setting(name, default = nil)
     setting(name,default,type)
     @@client_settings ||= []
     @@client_settings << name