diff --git a/plugins/work_assignment/controllers/myprofile/work_assignment_plugin_cms_controller.rb b/plugins/work_assignment/controllers/myprofile/work_assignment_plugin_cms_controller.rb
index 6d568d5..90cf980 100644
--- a/plugins/work_assignment/controllers/myprofile/work_assignment_plugin_cms_controller.rb
+++ b/plugins/work_assignment/controllers/myprofile/work_assignment_plugin_cms_controller.rb
@@ -51,28 +51,12 @@ class WorkAssignmentPluginCmsController < CmsController
     @target = ['',@parent.url[:profile], @parent.url[:page]].join('/')
     @email_contact
     if request.post? && params[:confirm] == 'true'
-      @files_paths = []
-      @files_string = params[:self_files_id]
-      @files_id_list = @files_string.split(' ')
-
-      @files_id_list.each do |file_id|
-        @file = environment.articles.find_by_id(file_id)
-        @real_file_url = "http://#{@file.url[:host]}:#{@file.url[:port]}/#{@file.url[:profile]}/#{@file.path}"
-        @files_paths << @real_file_url
-        unless params[:email_contact][:message].include? "#{@real_file_url}"
-          params[:email_contact][:message] += "<br> Clique <a href='#{@real_file_url}'>aqui</a> para acessar o arquivo ou acesse pela URL: <br>"
-          params[:email_contact][:message] += "<br><a href='#{@real_file_url}'>#{@real_file_url}</a>"
-        end
-      end
-      @message = "AVISO: O aluno deve imprimir este email e entrega-lo na secretaria como comprovante do envio!"
-      unless params[:email_contact][:message].include? "#{@message}"
-        params[:email_contact][:message] += "<br><br>#{@message}"
-      end
-      @email_contact = user.build_email_contact(params[:email_contact])
+      params[:email_contact][:message] = build_mail_message(params[:self_files_id],params[:email_contact][:message])
+	  @email_contact = user.build_email_contact(params[:email_contact])
       if @email_contact.deliver
         session[:notice] = _('Contact successfully sent')
         redirect_to @target
-      else
+	  else
         session[:notice] = _('Contact not sent')
       end
     elsif request.post? && params[:confirm] == 'false'
@@ -99,28 +83,25 @@ class WorkAssignmentPluginCmsController < CmsController
     end
   end
 
-#TODO
-#Refatorar o método send_email para utilizar o build_mail_message para inserir o link dos arquivos
-=begin
-  def build_mail_message
+  def build_mail_message(files_ids, message)
     @files_paths = []
-      @files_string = params[:self_files_id]
+      @files_string = files_ids
       @files_id_list = @files_string.split(' ')
 
       @files_id_list.each do |file_id|
         @file = environment.articles.find_by_id(file_id)
         @real_file_url = "http://#{@file.url[:host]}:#{@file.url[:port]}/#{@file.url[:profile]}/#{@file.path}"
         @files_paths << @real_file_url
-        unless params[:email_contact][:message].include? "#{@real_file_url}"
-          params[:email_contact][:message] += "<br> Clique <a href='#{@real_file_url}'>aqui</a> para acessar o arquivo ou acesse pela URL: <br>"
-          params[:email_contact][:message] += "<br><a href='#{@real_file_url}'>#{@real_file_url}</a>"
+        unless message.include? "#{@real_file_url}"
+          message += "<br> Clique <a href='#{@real_file_url}'>aqui</a> para acessar o arquivo ou acesse pela URL: <br>"
+          message += "<br><a href='#{@real_file_url}'>#{@real_file_url}</a>"
         end
       end
-      @message = "AVISO: O aluno deve imprimir este email e entrega-lo na secretaria como comprovante do envio!"
-      unless params[:email_contact][:message].include? "#{@message}"
-        params[:email_contact][:message] += "<br><br>#{@message}"
+      @warning_message = "AVISO: O aluno deve imprimir este email e entrega-lo na secretaria como comprovante do envio!"
+      unless message.include? "#{@warning_message}"
+        message += "<br><br>#{@warning_message}"
       end
+  	message
   end
-=end
 
 end
\ No newline at end of file
--
libgit2 0.21.2