diff --git a/app/models/highlights_block.rb b/app/models/highlights_block.rb
index 368fa30..a8d455f 100644
--- a/app/models/highlights_block.rb
+++ b/app/models/highlights_block.rb
@@ -12,6 +12,7 @@ class HighlightsBlock < Block
     block.images.each do |i|
       i[:image_id] = i[:image_id].to_i
       i[:position] = i[:position].to_i
+      i[:address] = Noosfero.root + i[:address]  unless Noosfero.root.nil?
       begin
         file = UploadedFile.find(i[:image_id])
         i[:image_src] = file.public_filename
diff --git a/test/unit/highlights_block_test.rb b/test/unit/highlights_block_test.rb
index 89043da..23453d2 100644
--- a/test/unit/highlights_block_test.rb
+++ b/test/unit/highlights_block_test.rb
@@ -119,6 +119,19 @@ class HighlightsBlockTest < ActiveSupport::TestCase
     block.featured_images
   end
 
+    should 'return correct sub-dir address' do
+    Noosfero.stubs(:root).returns("/social")
+    f1 = mock()
+    f1.expects(:public_filename).returns('address')
+    UploadedFile.expects(:find).with(1).returns(f1)
+    block = HighlightsBlock.new
+    i1 = {:image_id => 1, :address => '/address', :position => 3, :title => 'address'}
+    block.images = [i1]
+    block.save!
+    block.reload
+    assert_equal block.images.first[:address], "/social/address"
+  end
+
   [Environment, Profile].each do |klass|
     should "choose between owner galleries when owner is #{klass.name}" do
       owner = fast_create(klass)
--
libgit2 0.21.2