diff --git a/app/views/dmsf/edit.html.erb b/app/views/dmsf/edit.html.erb
index 171896ca..90b31c0d 100644
--- a/app/views/dmsf/edit.html.erb
+++ b/app/views/dmsf/edit.html.erb
@@ -7,9 +7,15 @@
 <% 
   create = @pathfolder == @parent 
 %>
-<h2>
-<%= render(:partial => "path", :locals => {:path => @pathfolder.nil? ? [] : @pathfolder.dmsf_path}) %>
-<%= ("/ " + l(:heading_new_folder)) if create %>
+
+<h2>  
+  <% path = @pathfolder ? @pathfolder.dmsf_path : [] %>  
+  <%= link_to l(:link_documents), {:controller => 'dmsf', :action => 'show', :id=> @project } %>
+  <% path.each do |path_element| %>
+    / 
+    <%= link_to h(path_element.title), {:controller => 'dmsf', :action => 'show', :id=> @project, :folder_id => path_element} %>   
+  <% end %>
+  <%= "/ #{l(:heading_new_folder)}" if create %>
 </h2>
 
 <%= form_for(@folder, :url => {:action => create ? "create" : "save", :id => @project, :folder_id => @folder, :parent_id => @parent},
diff --git a/app/views/dmsf/email_entries.html.erb b/app/views/dmsf/email_entries.html.erb
index 7740daa3..35373721 100644
--- a/app/views/dmsf/email_entries.html.erb
+++ b/app/views/dmsf/email_entries.html.erb
@@ -3,9 +3,13 @@
 <div class="contextual">
 </div>
 
-<% path = @folder.nil? ? [] : @folder.dmsf_path %>
-<h2>
-<%= render(:partial => 'path', :locals => {:path => path}) %>
+<h2>  
+  <% path = @folder ? @folder.dmsf_path : [] %>  
+  <%= link_to l(:link_documents), {:controller => 'dmsf', :action => 'show', :id=> @project } %>
+  <% path.each do |path_element| %>
+    / 
+    <%= link_to h(path_element.title), {:controller => 'dmsf', :action => 'show', :id=> @project, :folder_id => path_element} %>   
+  <% end %>  
 </h2>
 
 <h3><%= l(:heading_send_documents_by_email) %></h3>
diff --git a/app/views/dmsf_files_copy/new.html.erb b/app/views/dmsf_files_copy/new.html.erb
index a51d6dc4..3debefac 100644
--- a/app/views/dmsf_files_copy/new.html.erb
+++ b/app/views/dmsf_files_copy/new.html.erb
@@ -3,12 +3,16 @@
 <div class="contextual">
 </div>
 
-<% path = @file.folder.nil? ? [] : @file.folder.dmsf_path %>
-<h2>
-<%= render(:partial => "/dmsf/path", :locals => {:path => path}) %>
-/
-<%= link_to(h(@file.title), {:controller => "dmsf_files", :action => "show", :id=> @file}) %>
-<%= image_tag("notify.png", :plugin => "redmine_dmsf", :title => l(:title_notifications_active)) if @file.notification %>
+<h2>  
+  <% path = @file.folder ? @file.folder.dmsf_path : [] %>  
+  <%= link_to l(:link_documents), {:controller => 'dmsf', :action => 'show', :id=> @project } %>
+  <% path.each do |path_element| %>
+   / 
+   <%= link_to h(path_element.title), {:controller => 'dmsf', :action => 'show', :id=> @project, :folder_id => path_element} %>   
+  <% end %>
+  /
+  <%= link_to(h(@file.title), {:controller => "dmsf_files", :action => "show", :id=> @file}) %>
+  <%= image_tag("notify.png", :plugin => "redmine_dmsf", :title => l(:title_notifications_active)) if @file.notification %>
 </h2>
 
 <% unless DmsfFile.allowed_target_projects_on_copy.blank? %>
diff --git a/app/views/dmsf_folders_copy/new.html.erb b/app/views/dmsf_folders_copy/new.html.erb
index bda0ef7a..c2d9f365 100644
--- a/app/views/dmsf_folders_copy/new.html.erb
+++ b/app/views/dmsf_folders_copy/new.html.erb
@@ -3,7 +3,13 @@
 <div class="contextual">
 </div>
 
-<h2><%= render(:partial => "/dmsf/path", :locals => {:path => @folder.dmsf_path}) %></h2>
+<h2>    
+  <%= link_to l(:link_documents), {:controller => 'dmsf', :action => 'show', :id=> @project } %>
+  <% @folder.dmsf_path.each do |path_element| %>
+   / 
+   <%= link_to h(path_element.title), {:controller => 'dmsf', :action => 'show', :id=> @project, :folder_id => path_element} %>   
+  <% end %>  
+</h2>
 
 <% unless DmsfFolder.allowed_target_projects_on_copy.blank? %>
 	<%= form_tag({:action => "copy_to", :id => @folder}, :id => "copyForm") do |f| %>
diff --git a/app/views/hooks/redmine_dmsf/_view_projects_form.html.erb b/app/views/hooks/redmine_dmsf/_view_projects_form.html.erb
index 0838399e..42fea1ef 100644
--- a/app/views/hooks/redmine_dmsf/_view_projects_form.html.erb
+++ b/app/views/hooks/redmine_dmsf/_view_projects_form.html.erb
@@ -1,4 +1,4 @@
-<% if @project.new_record? && !@source_project.nil? %>
+<% if @project.new_record? && @source_project %>
   <p>
     <label class="block"><%= check_box_tag 'only[]', 'dmsf', true %><%= l(:label_dmsf_plural, @source_project.dmsf_count) %></label>
   </p>