diff --git a/app/controllers/calendar_controller.rb b/app/controllers/calendar_controller.rb
index 51b8cabc..dc00bcca 100644
--- a/app/controllers/calendar_controller.rb
+++ b/app/controllers/calendar_controller.rb
@@ -13,6 +13,9 @@ class CalendarController < ApplicationController
 
     respond_to do |format|
       format.html
+      format.m {
+        cookies[:mobile_url]= {:value => request.fullpath, :secure => SITE_CONFIG['secure_cookies']}
+      }
       format.ics   {
         render :action => 'show', :layout => false, :content_type => Mime::ICS
       }
diff --git a/app/views/calendar/show.m.erb b/app/views/calendar/show.m.erb
new file mode 100644
index 00000000..ff4974fc
--- /dev/null
+++ b/app/views/calendar/show.m.erb
@@ -0,0 +1,5 @@
+<%= todos_calendar_container(:due_today,            @calendar.due_today           ) %>
+<%= todos_calendar_container(:due_this_week,        @calendar.due_this_week       ) %>
+<%= todos_calendar_container(:due_next_week,        @calendar.due_next_week       ) %>
+<%= todos_calendar_container(:due_this_month,       @calendar.due_this_month      ) %>
+<%= todos_calendar_container(:due_after_this_month, @calendar.due_after_this_month) %>
diff --git a/app/views/layouts/mobile.m.erb b/app/views/layouts/mobile.m.erb
index 8301c184..e8266e7f 100644
--- a/app/views/layouts/mobile.m.erb
+++ b/app/views/layouts/mobile.m.erb
@@ -31,8 +31,8 @@
   <li class="link"><%= (link_to(t('layouts.mobile_navigation.home'), todos_path(:format => 'm'))) -%></li>
   <li class="link"><%= (link_to(t('layouts.mobile_navigation.logout'), logout_path(:format => 'm'))) -%></li>
   <li class="link"><%= (link_to(t('layouts.mobile_navigation.tickler'), tickler_path(:format => :m))) -%></li>
+  <li class="link"><%= (link_to(t('layouts.mobile_navigation.calendar'), calendar_path(:format => :m))) -%></li>
   <li class="link"><%= (link_to(t('layouts.mobile_navigation.feeds'), feeds_path(:format=>:m))) -%></li>
-  <li class="link"><%= (link_to(t('layouts.mobile_navigation.full'),  todos_path(:format => 'html'))) -%></li>
 </ul>
 <% end -%>
 <%= render :partial => "shared/footer" -%>
diff --git a/app/views/shared/_footer.m.erb b/app/views/shared/_footer.m.erb
index b8ac1fc7..b5881131 100644
--- a/app/views/shared/_footer.m.erb
+++ b/app/views/shared/_footer.m.erb
@@ -1 +1 @@
-<div class="footer"><p>Mobile Tracks <%= TRACKS_VERSION %>: <a href="http://groups.google.com/group/TracksApp"><%= t('common.mailing_list')%></a> | <a href="http://getontracks.org/"><%= t('common.website')%></a> | <a href="http://getontracks.org/development/"><%= t('common.contribute')%></a></p></div>
+<div class="footer"><p>Tracks <%= TRACKS_VERSION %> Mobile | <%= (link_to(t('layouts.mobile_navigation.full'),  todos_path(:format => 'html'))) -%></p></div>
diff --git a/app/views/todos/_collection.m.erb b/app/views/todos/_collection.m.erb
new file mode 100644
index 00000000..8d79bda0
--- /dev/null
+++ b/app/views/todos/_collection.m.erb
@@ -0,0 +1,8 @@
+<%= 
+  settings[:show_container] = !collection.empty? || settings[:show_empty_containers]
+  
+  todos_container(settings) do
+    todos_container_header(settings) +
+    todos_container_items(collection, settings) 
+  end 
+%>
\ No newline at end of file