diff --git a/Gemfile.lock b/Gemfile.lock
index 2f35328ca..1055c8e60 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -58,7 +58,6 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
-    SystemTimer (1.2.1)
     abstract (1.0.0)
     actionmailer (3.0.3)
       actionpack (= 3.0.3)
@@ -87,6 +86,7 @@ GEM
       activesupport (= 3.0.3)
     activesupport (3.0.3)
     addressable (2.2.2)
+    archive-tar-minitar (0.5.2)
     arel (2.0.7)
     aws (2.3.32)
       activesupport
@@ -103,7 +103,6 @@ GEM
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       selenium-webdriver (>= 0.0.3)
-    cgi_multipart_eof_fix (2.5.0)
     chef (0.9.12)
       bunny (>= 0.6.0)
       erubis
@@ -159,7 +158,6 @@ GEM
     faraday_middleware (0.3.1)
       faraday (~> 0.5.3)
     fastercsv (1.5.4)
-    fastthread (1.0.7)
     ffi (0.6.3)
       rake (>= 0.8.7)
     fixture_builder (0.2.0)
@@ -173,7 +171,6 @@ GEM
       nokogiri (~> 1.4.3.1)
       ruby-hmac
     formatador (0.0.16)
-    gem_plugin (0.2.3)
     gherkin (2.3.3)
       json (~> 1.4.6)
     googlecharts (1.6.0)
@@ -190,7 +187,8 @@ GEM
     launchy (0.3.7)
       configuration (>= 0.0.5)
       rake (>= 0.8.1)
-    linecache (0.43)
+    linecache19 (0.5.11)
+      ruby_core_source (>= 0.1.4)
     mail (2.2.14)
       activesupport (>= 2.3.6)
       i18n (>= 0.4.0)
@@ -207,11 +205,6 @@ GEM
     mocha (0.9.10)
       rake
     moneta (0.6.0)
-    mongrel (1.1.5)
-      cgi_multipart_eof_fix (>= 2.4)
-      daemons (>= 1.0.3)
-      fastthread (>= 1.0.1)
-      gem_plugin (>= 0.2.3)
     multi_json (0.0.5)
     multi_xml (0.2.0)
     multipart-post (1.1.0)
@@ -307,15 +300,20 @@ GEM
       activesupport (~> 3.0)
       railties (~> 3.0)
       rspec (~> 2.4.0)
-    ruby-debug (0.10.4)
-      columnize (>= 0.1)
-      ruby-debug-base (~> 0.10.4.0)
-    ruby-debug-base (0.10.4)
-      linecache (>= 0.3)
+    ruby-debug-base19 (0.11.24)
+      columnize (>= 0.3.1)
+      linecache19 (>= 0.5.11)
+      ruby_core_source (>= 0.1.4)
+    ruby-debug19 (0.11.6)
+      columnize (>= 0.3.1)
+      linecache19 (>= 0.5.11)
+      ruby-debug-base19 (>= 0.11.19)
     ruby-hmac (0.4.0)
     ruby-openid (2.1.8)
     ruby-openid-apps-discovery (1.2.0)
       ruby-openid (>= 2.1.7)
+    ruby_core_source (0.1.4)
+      archive-tar-minitar (>= 0.5.2)
     rubyntlm (0.1.1)
     rubyzip (0.9.4)
     selenium-client (1.2.18)
@@ -358,7 +356,6 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  SystemTimer (= 1.2.1)
   addressable (= 2.2.2)
   aws (= 2.3.32)
   bundler (>= 1.0.0)
@@ -384,7 +381,6 @@ DEPENDENCIES
   launchy
   mini_magick (= 3.2)
   mocha
-  mongrel
   mysql2 (= 0.2.6)
   nokogiri (= 1.4.3.1)
   omniauth (= 0.1.6)
@@ -395,7 +391,7 @@ DEPENDENCIES
   rspec (>= 2.0.0)
   rspec-instafail
   rspec-rails (>= 2.0.0)
-  ruby-debug
+  ruby-debug19
   thin (= 1.2.7)
   twitter!
   webmock
diff --git a/app/views/layouts/application.mobile.haml b/app/views/layouts/application.mobile.haml
index acd9337ee..36eed2ecf 100644
--- a/app/views/layouts/application.mobile.haml
+++ b/app/views/layouts/application.mobile.haml
@@ -6,7 +6,7 @@
 %html{:lang => I18n.locale.to_s}
   %head
     %title
-      = "#{current_user.name} | diaspora" if current_user
+      DIASPORA*
 
     %meta{"http-equiv"=>"Content-Type", :content=>"text/html; charset=utf-8"}/
 
@@ -22,14 +22,18 @@
   %body
     #content{:data => {:role => 'page'}}
       #header_sauce
+        - if current_user
+          .right
+            = link_to(image_tag('icons/search_white.png'), people_path)
         = link_to(image_tag('white.png'), aspects_path)
 
       = yield
 
       #footer_sauce
-        logged in as
-        = link_to current_user.name, current_user.person
+        - if current_user
+          logged in as
+          = link_to current_user.name, current_user.person
 
-        %br
-        = link_to 'logout', '#'
+          %br
+          = link_to 'logout', '#'
 
diff --git a/app/views/people/_person.mobile.haml b/app/views/people/_person.mobile.haml
new file mode 100644
index 000000000..cc424791d
--- /dev/null
+++ b/app/views/people/_person.mobile.haml
@@ -0,0 +1,30 @@
+-#   Copyright (c) 2010, Diaspora Inc.  This file is
+-#   licensed under the Affero General Public License version 3 or later.  See
+-#   the COPYRIGHT file.
+
+.stream_element{:id => person.id}
+
+  .right{:style=>"display:inline;"}
+    - if person.owner_id == current_user.id
+      = t('.thats_you')
+    - elsif contact && !contact.pending
+      = t('.already_connected')
+    - elsif (contact && contact.pending) || request
+      = t('.pending_request')
+    - else
+      = link_to t('people.show.start_sharing'),
+        {:controller => "people",
+        :action => "share_with",
+        :id => person.id},
+        :class => 'button',
+        :rel => 'facebox'
+
+  = person_image_link(person)
+
+  .content
+    %span.from
+      =person_link(person)
+
+    .info
+      = person.diaspora_handle
+
diff --git a/app/views/people/index.mobile.haml b/app/views/people/index.mobile.haml
new file mode 100644
index 000000000..1cd619625
--- /dev/null
+++ b/app/views/people/index.mobile.haml
@@ -0,0 +1,36 @@
+-#   Copyright (c) 2010, Diaspora Inc.  This file is
+-#   licensed under the Affero General Public License version 3 or later.  See
+-#   the COPYRIGHT file.
+
+- content_for :page_title do
+  = t('search')
+
+
+%div{:style => 'text-align:center;'}
+  = form_tag(people_path, :method => 'get') do
+    %div{:data => {:role => 'fieldcontain', :inline => 'true'}}
+      = search_field_tag :q
+      = submit_tag :search, 'data-inline' => 'true'
+
+
+- if params[:q].blank?
+  %h4
+    =t('.no_results')
+- else
+  %h4#search_title
+    =t('.results_for')
+    %span.term
+      = params[:q]
+
+
+  - if @hashes.empty?
+    %p
+      =t('.no_one_found')
+
+  - else
+    #people_stream.stream
+      - for hash in @hashes
+        = render :partial => 'people/person', :locals => hash
+
+    = will_paginate @people
+
diff --git a/app/views/photos/show.mobile.haml b/app/views/photos/show.mobile.haml
new file mode 100644
index 000000000..c373911c9
--- /dev/null
+++ b/app/views/photos/show.mobile.haml
@@ -0,0 +1,8 @@
+-#   Copyright (c) 2010, Diaspora Inc.  This file is
+-#   licensed under the Affero General Public License version 3 or later.  See
+-#   the COPYRIGHT file.
+
+
+#show_content.photo
+  = image_tag @photo.url(:scaled_full)
+
diff --git a/public/images/icons/search_white.png b/public/images/icons/search_white.png
new file mode 100644
index 000000000..7f35bc54a
Binary files /dev/null and b/public/images/icons/search_white.png differ
diff --git a/public/stylesheets/sass/mobile.sass b/public/stylesheets/sass/mobile.sass
index f33599606..6158c3c0d 100644
--- a/public/stylesheets/sass/mobile.sass
+++ b/public/stylesheets/sass/mobile.sass
@@ -145,6 +145,10 @@ a:not([role='button'])
     :font
       :size smaller
 
+  &.photo
+    :background
+      :color #000
+
 ul
   :margin 0
   :padding 0
@@ -261,6 +265,18 @@ textarea.scrunch
   :border
     :bottom 1px solid #000
 
+  img
+    :padding
+      :top 2px
+    :margin
+      :bottom -2px
+
+  .right
+    :position absolute
+    :top 0
+    :padding 6px
+    :right 0
+
 #footer_sauce
   :background
     :color #ccc