diff --git a/app/views/devise/passwords/edit.mobile.haml b/app/views/devise/passwords/edit.mobile.haml
new file mode 100644
index 000000000..db592f77c
--- /dev/null
+++ b/app/views/devise/passwords/edit.mobile.haml
@@ -0,0 +1,29 @@
+-#   Copyright (c) 2010-2011, Diaspora Inc.  This file is
+-#   licensed under the Affero General Public License version 3 or later.  See
+-#   the COPYRIGHT file.
+
+#main_stream.stream
+  #login_form
+    .login-container
+      = form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :put }) do |f|
+        = devise_error_messages!
+        = f.hidden_field :reset_password_token
+        %fieldset
+          %legend
+            =t('.change_password')
+
+          .control-group
+            = f.label :password, t('password'), :class => "control-label"
+            .controls
+              = f.password_field :password
+
+          .control-group
+            = f.label :password_confirmation, t('password_confirmation'), :class => "control-label"
+            .controls
+              = f.password_field :password_confirmation
+
+          .controls
+            = f.submit t('.change_password'), :class => 'btn primary'
+
+%footer
+  = link_to t('layouts.application.toggle'), toggle_mobile_path
diff --git a/app/views/devise/passwords/new.mobile.haml b/app/views/devise/passwords/new.mobile.haml
new file mode 100644
index 000000000..ea60939b3
--- /dev/null
+++ b/app/views/devise/passwords/new.mobile.haml
@@ -0,0 +1,29 @@
+-#   Copyright (c) 2010-2011, Diaspora Inc.  This file is
+-#   licensed under the Affero General Public License version 3 or later.  See
+-#   the COPYRIGHT file.
+
+#main_stream.stream
+  #login_form
+    .login-container
+      = form_for(resource, :as => resource_name, :url => password_path(resource_name)) do |f|
+        %fieldset
+          %legend
+            =t('.forgot_password')
+          - unless devise_error_messages!.empty?
+            %i=  t('.no_account')
+
+          .control-group
+            = f.label :email, t('email'), :class => "control-label"
+            .controls
+              = f.text_field :email
+
+          .controls
+            = f.submit t('.send_password_instructions'), :class => 'btn'
+
+%footer
+  - if display_registration_link?    
+    = link_to t('devise.shared.links.sign_up'), new_registration_path(resource_name)
+
+  = link_to t('devise.sessions.new.sign_in'), new_user_session_path()
+
+  = link_to t('layouts.application.toggle'), toggle_mobile_path