diff --git a/app/helpers/dates_helper.rb b/app/helpers/dates_helper.rb
index ba3827e..6d19e24 100644
--- a/app/helpers/dates_helper.rb
+++ b/app/helpers/dates_helper.rb
@@ -17,10 +17,14 @@ module DatesHelper
     N_('December')
   ]
 
+  def month_name(n)
+    _(MONTHS[n-1])
+  end
+
   # formats a date for displaying.
   def show_date(date)
     if date
-      date.strftime(_('%d %B %Y'))
+      _('%{month} %{day}, %{year}') % { :day => date.day, :month => month_name(date.month), :year => date.year }
     else
       ''
     end
@@ -66,7 +70,7 @@ module DatesHelper
     end
 
     # FIXME Date#strftime should translate this for us !!! 
-    monthname = _(MONTHS[month.to_i - 1])
+    monthname = month_name(month.to_i)
 
     _('%{month} %{year}') % { :year => year, :month => monthname }
   end
diff --git a/app/models/event.rb b/app/models/event.rb
index 59472c1..213cde3 100644
--- a/app/models/event.rb
+++ b/app/models/event.rb
@@ -79,10 +79,16 @@ class Event < Article
         }
       }
 
-      html.div '_____XXXX_DESCRIPTION_GOES_HERE_XXXX_____'
+      if self.description
+        html.div '_____XXXX_DESCRIPTION_GOES_HERE_XXXX_____'
+      end
     }
 
-    result.sub('_____XXXX_DESCRIPTION_GOES_HERE_XXXX_____', self.description)
+    if self.description
+      result.sub!('_____XXXX_DESCRIPTION_GOES_HERE_XXXX_____', self.description)
+    end
+
+    result
   end
 
   def link=(value)
diff --git a/app/views/search/_event.rhtml b/app/views/search/_event.rhtml
new file mode 100644
index 0000000..1d71a2b
--- /dev/null
+++ b/app/views/search/_event.rhtml
@@ -0,0 +1,7 @@
+<li>
+  <%= image_tag 'icons-mime/event.png', :style => 'float: left' %>
+  <strong><%= link_to(event.title, event.url) %></strong>
+  <div class="item_meta">
+    <%= show_period(event.start_date, event.end_date) %>
+  </div>
+</li>
diff --git a/public/stylesheets/controller_search.css b/public/stylesheets/controller_search.css
index 47f5641..c6ecd9a 100644
--- a/public/stylesheets/controller_search.css
+++ b/public/stylesheets/controller_search.css
@@ -151,16 +151,20 @@
 }
 
 #content .search-results-type-article ul,
-#content .search-results-type-article li {
+#content .search-results-type-article ul,
+#content .search-results-type-event ul,
+#content .search-results-type-event li {
   margin: 0px;
   padding: 0px;
   list-style: none;
 }
-#content .search-results-type-article li {
+#content .search-results-type-article li,
+#content .search-results-type-event li {
   padding: 2px 0px 4px 0px;
 }
 
-.search-results-type-article .item_meta {
+.search-results-type-article .item_meta,
+.search-results-type-event .item_meta {
   font-size: 10px;
   color: #888;
 }
diff --git a/test/unit/dates_helper_test.rb b/test/unit/dates_helper_test.rb
index 36b276f..e9c3df0 100644
--- a/test/unit/dates_helper_test.rb
+++ b/test/unit/dates_helper_test.rb
@@ -4,6 +4,17 @@ class DatesHelperTest < Test::Unit::TestCase
 
   include DatesHelper
 
+  should 'translate month names' do
+    expects(:_).with('January').returns('Janeiro')
+    assert_equal "Janeiro", month_name(1)
+  end
+
+  should 'display date with translation' do
+    expects(:_).with('%{month} %{day}, %{year}').returns('%{day} de %{month} de %{year}')
+    expects(:_).with('January').returns('Janeiro')
+    assert_equal '11 de Janeiro de 2008', show_date(Date.new(2008, 1, 11))
+  end
+
   should 'generate period with two dates' do
     date1 = mock
     expects(:show_date).with(date1).returns('XXX')
diff --git a/test/unit/event_test.rb b/test/unit/event_test.rb
index ff13929..32a4185 100644
--- a/test/unit/event_test.rb
+++ b/test/unit/event_test.rb
@@ -138,6 +138,12 @@ class EventTest < ActiveSupport::TestCase
     
   end
 
+  should 'not crash when description is blank' do
+    e = Event.new
+    assert_nil e.description
+    assert_no_match(/_____XXXX_DESCRIPTION_GOES_HERE_XXXX_____/, e.to_html)
+  end
+
   should 'add http:// to the link if not already present' do
     a = Event.new(:link => 'www.nohttp.net')
     assert_equal 'http://www.nohttp.net', a.link
--
libgit2 0.21.2