--- a/app/models/mailer.rb
+++ b/app/models/mailer.rb
@@ -2,15 +2,18 @@ class Mailer < ActionMailer::Base
   def signup_notification(user)
     setup_email(user)
     @subject    += 'Please activate your new account'
-    @body[:url]  = "http://#{GitoriousConfig['gitorious_host']}/users/activate/#{user.activation_code}"
-  
+    @body[:url]  = url_for(
+      :controller => 'users',
+      :action => 'activate',
+      :activation_code => user.activation_code
+    )
   end
-  
+
   def activation(user)
     setup_email(user)
     @subject    += 'Your account has been activated!'
   end
-  
+
   def new_repository_clone(repository)
     setup_email(repository.project.user)
     @subject += %Q{#{repository.user.login} has cloned #{repository.project.slug}/#{repository.parent.name}}
@@ -18,26 +21,28 @@ class Mailer < ActionMailer::Base
     @body[:cloner] = repository.user
     @body[:project] = repository.project
     @body[:repository] = repository
-    @body[:url] = "http://#{GitoriousConfig['gitorious_host']}/p/#{repository.project.slug}/repos/#{repository.name}"
+    @body[:url] =  project_repository_url(repository.project, repository)
   end
-  
+
   def merge_request_notification(merge_request)
     setup_email(merge_request.target_repository.user)
     @subject += %Q{#{merge_request.source_repository.user.login} has requested a merge in #{merge_request.target_repository.project.title}}
     @body[:merge_request] = merge_request
     @body[:project] = merge_request.target_repository.project
-    url = "http://#{GitoriousConfig['gitorious_host']}/p/#{merge_request.target_repository.project.slug}"
-    url << "/repos/#{merge_request.target_repository.name}"
-    url << "/merge_requests/#{merge_request.id}"
-    @body[:url] = url
+    @body[:url] =
+      project_repository_merge_request_url(
+        merge_request.target_repository.project,
+        merge_request.target_repository,
+        merge_request
+      )
   end
-  
+
   def forgotten_password(user, password)
     setup_email(user)
     @subject += "Your new password"
     @body[:password] = password
   end
-  
+
   protected
     def setup_email(user)
       @recipients  = "#{user.email}"

--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -14,8 +14,10 @@ config.action_controller.perform_caching             = false
 config.action_view.cache_template_extensions         = false
 config.action_view.debug_rjs                         = true
 
-# Don't care if the mailer can't send
+# ActionMailer::Base.default_url_options[:protocol] = 'https'
+ActionMailer::Base.default_url_options[:host] =
+  YAML.load_file(File.join(RAILS_ROOT, "config/gitorious.yml"))["gitorious_host"]
 config.action_mailer.raise_delivery_errors = false
 config.action_mailer.delivery_method = :test
-ExceptionNotifier.exception_recipients = YAML.load_file(File.join(RAILS_ROOT, 
-  "config/gitorious.yml"))["exception_notification_emails"]
\ No newline at end of file
+ExceptionNotifier.exception_recipients = YAML.load_file(File.join(RAILS_ROOT,
+  "config/gitorious.yml"))["exception_notification_emails"]

--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -23,12 +23,14 @@ config.action_controller.fragment_cache_store = :file_store, File.join(cache_dir
 # Enable serving of images, stylesheets, and javascripts from an asset server
 # config.action_controller.asset_host                  = "http://assets.example.com"
 
+# ActionMailer::Base.default_url_options[:protocol] = 'https'
+ActionMailer::Base.default_url_options[:host] =
+  YAML.load_file(File.join(RAILS_ROOT, "config/gitorious.yml"))["gitorious_host"]
 # Disable delivery errors, bad email addresses will be ignored
 # config.action_mailer.raise_delivery_errors = false
-
-ExceptionNotifier.exception_recipients = YAML.load_file(File.join(RAILS_ROOT, 
+ExceptionNotifier.exception_recipients = YAML.load_file(File.join(RAILS_ROOT,
   "config/gitorious.yml"))["exception_notification_emails"]
-ExceptionNotifier.class_eval do 
-  remove_method :template_root 
-  ExceptionNotifier.template_root = "#{RAILS_ROOT}/vendor/plugins/exception_notification/lib/../views" 
+ExceptionNotifier.class_eval do
+  remove_method :template_root
+  ExceptionNotifier.template_root = "#{RAILS_ROOT}/vendor/plugins/exception_notification/lib/../views"
 end
\ No newline at end of file

--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -16,6 +16,9 @@ config.action_controller.perform_caching             = false
 # Disable request forgery protection in test environment
 config.action_controller.allow_forgery_protection    = false
 
+# ActionMailer::Base.default_url_options[:protocol] = 'https'
+ActionMailer::Base.default_url_options[:host] =
+  YAML.load_file(File.join(RAILS_ROOT, "config/gitorious.yml"))["gitorious_host"]
 # Tell ActionMailer not to deliver emails to the real world.
 # The :test delivery method accumulates sent emails in the
 # ActionMailer::Base.deliveries array.

--- a/spec/models/mailer_spec.rb
+++ b/spec/models/mailer_spec.rb
@@ -1,59 +1,65 @@
 require File.dirname(__FILE__) + '/../spec_helper'
 
 describe Mailer do
+  URL_BASE = "#{Mailer.default_url_options[:protocol]||'http'}://#{Mailer.default_url_options[:host]}"
+
   before(:each) do
     Mailer.deliveries = []
   end
-  
+
   it "send new_repository_clone" do
     repos = repositories(:johans2)
+    url = "#{URL_BASE}/projects/#{repos.project.slug}/repos/#{repos.name}"
     mail = Mailer.create_new_repository_clone(repos)
-    
+
     mail.to.should == [repos.project.user.email]
     mail.subject.should == %Q{[Gitorious] #{repos.user.login} has cloned #{repos.project.slug}/#{repos.parent.name}}
     mail.body.should match(/#{repos.user.login} recently created a clone/)
-    mail.body.should match(/\/p\/#{repos.project.slug}\/repos\/#{repos.name}/)
-    
+    mail.body.should include(url)
+
     Mailer.deliver(mail)
     Mailer.deliveries.should == [mail]
   end
-  
+
   it "sends signup_notification" do
     user = users(:johan)
     user.password = "fubar"
+    url = "#{URL_BASE}/users/activate/#{user.activation_code}"
     mail = Mailer.create_signup_notification(user)
-    
+
     mail.to.should == [user.email]
     mail.subject.should == "[Gitorious] Please activate your new account"
-    mail.body.should match(/users\/activate\/#{user.activation_code}/)
     mail.body.should match(/username is #{user.login}$/)
-    
+    mail.body.should include(url)
+
     Mailer.deliver(mail)
     Mailer.deliveries.should == [mail]
   end
-  
+
   it "sends activation" do
     user = users(:johan)
     mail = Mailer.create_activation(user)
-    
+
     mail.to.should == [user.email]
     mail.subject.should == "[Gitorious] Your account has been activated!"
     mail.body.should match(/your account has been activated/)
-    
+
     Mailer.deliver(mail)
     Mailer.deliveries.should == [mail]
   end
-  
+
   it "sends merge_request_notification" do
     merge_request = merge_requests(:moes_to_johans)
+    url = "#{URL_BASE}/projects/#{merge_request.target_repository.project.slug}/repos/#{merge_request.target_repository.name}/merge_requests/#{merge_request.id}"
     mail = Mailer.create_merge_request_notification(merge_request)
-    
+
     mail.to.should == [merge_request.target_repository.user.email]
     mail.subject.should == "[Gitorious] moe has requested a merge in johans project"
     mail.body.should match(/moe has requested that you merge #{merge_request.source_repository.name} with #{merge_request.target_repository.name}/)
     mail.body.should match(/in the #{merge_request.target_repository.project.title} project/)
     mail.body.should include(merge_request.proposal)
-    
+    mail.body.should include(url)
+
     Mailer.deliver(mail)
     Mailer.deliveries.should == [mail]
   end