overdue merge of 0.9.x into trunk

112 files changed, 2473 insertions, 727 deletions

diff --git a/res/anim/push_left_in.xml b/res/anim/push_left_in.xml
new file mode 100644
index 000000000..b7d2d0da0
--- /dev/null
+++ b/res/anim/push_left_in.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!-- Copyright (C) 2007 The Android Open Source Project

+

+     Licensed under the Apache License, Version 2.0 (the "License");

+     you may not use this file except in compliance with the License.

+     You may obtain a copy of the License at

+

+          http://www.apache.org/licenses/LICENSE-2.0

+

+     Unless required by applicable law or agreed to in writing, software

+     distributed under the License is distributed on an "AS IS" BASIS,

+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

+     See the License for the specific language governing permissions and

+     limitations under the License.

+-->

+

+<set xmlns:android="http://schemas.android.com/apk/res/android">

+  <translate android:fromXDelta="100%p" android:toXDelta="0" android:duration="500"/>

+  <alpha android:fromAlpha="1.0" android:toAlpha="1.0" android:duration="500" />

+</set>

diff --git a/res/anim/push_left_out.xml b/res/anim/push_left_out.xml
new file mode 100644
index 000000000..6bdc0ce47
--- /dev/null
+++ b/res/anim/push_left_out.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!-- Copyright (C) 2007 The Android Open Source Project

+

+     Licensed under the Apache License, Version 2.0 (the "License");

+     you may not use this file except in compliance with the License.

+     You may obtain a copy of the License at

+

+          http://www.apache.org/licenses/LICENSE-2.0

+

+     Unless required by applicable law or agreed to in writing, software

+     distributed under the License is distributed on an "AS IS" BASIS,

+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

+     See the License for the specific language governing permissions and

+     limitations under the License.

+-->

+

+<set xmlns:android="http://schemas.android.com/apk/res/android">

+  <translate android:fromXDelta="0" android:toXDelta="-100%p" android:duration="500"/>

+  <alpha android:fromAlpha="1.0" android:toAlpha="1.0" android:duration="500" />

+</set>
\ No newline at end of file
diff --git a/res/anim/push_right_in.xml b/res/anim/push_right_in.xml
new file mode 100644
index 000000000..89daae972
--- /dev/null
+++ b/res/anim/push_right_in.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!-- Copyright (C) 2007 The Android Open Source Project

+

+     Licensed under the Apache License, Version 2.0 (the "License");

+     you may not use this file except in compliance with the License.

+     You may obtain a copy of the License at

+

+          http://www.apache.org/licenses/LICENSE-2.0

+

+     Unless required by applicable law or agreed to in writing, software

+     distributed under the License is distributed on an "AS IS" BASIS,

+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

+     See the License for the specific language governing permissions and

+     limitations under the License.

+-->

+

+<set xmlns:android="http://schemas.android.com/apk/res/android">

+  <translate android:fromXDelta="-100%p" android:toXDelta="0" android:duration="500"/>

+  <alpha android:fromAlpha="1.0" android:toAlpha="1.0" android:duration="500" />

+</set>

diff --git a/res/anim/push_right_out.xml b/res/anim/push_right_out.xml
new file mode 100644
index 000000000..b4b796b52
--- /dev/null
+++ b/res/anim/push_right_out.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!-- Copyright (C) 2007 The Android Open Source Project

+

+     Licensed under the Apache License, Version 2.0 (the "License");

+     you may not use this file except in compliance with the License.

+     You may obtain a copy of the License at

+

+          http://www.apache.org/licenses/LICENSE-2.0

+

+     Unless required by applicable law or agreed to in writing, software

+     distributed under the License is distributed on an "AS IS" BASIS,

+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

+     See the License for the specific language governing permissions and

+     limitations under the License.

+-->

+

+<set xmlns:android="http://schemas.android.com/apk/res/android">

+  <translate android:fromXDelta="0" android:toXDelta="100%p" android:duration="500"/>

+  <alpha android:fromAlpha="1.0" android:toAlpha="1.0" android:duration="500" />

+</set>
\ No newline at end of file
diff --git a/res/drawable-hdpi-finger/btn_circle_disable.png b/res/drawable-hdpi-finger-v4/btn_circle_disable.png
index ae063b545..ae063b545 100644
--- a/res/drawable-hdpi-finger/btn_circle_disable.png
+++ b/res/drawable-hdpi-finger-v4/btn_circle_disable.png
diff --git a/res/drawable-hdpi-finger/btn_circle_disable_focused.png b/res/drawable-hdpi-finger-v4/btn_circle_disable_focused.png
index 7a5d4fe4e..7a5d4fe4e 100644
--- a/res/drawable-hdpi-finger/btn_circle_disable_focused.png
+++ b/res/drawable-hdpi-finger-v4/btn_circle_disable_focused.png
diff --git a/res/drawable-hdpi-finger/btn_circle_normal.png b/res/drawable-hdpi-finger-v4/btn_circle_normal.png
index 5eda66883..5eda66883 100644
--- a/res/drawable-hdpi-finger/btn_circle_normal.png
+++ b/res/drawable-hdpi-finger-v4/btn_circle_normal.png
diff --git a/res/drawable-hdpi-finger/btn_circle_pressed.png b/res/drawable-hdpi-finger-v4/btn_circle_pressed.png
index 88848bac2..88848bac2 100644
--- a/res/drawable-hdpi-finger/btn_circle_pressed.png
+++ b/res/drawable-hdpi-finger-v4/btn_circle_pressed.png
diff --git a/res/drawable-hdpi-finger/btn_circle_selected.png b/res/drawable-hdpi-finger-v4/btn_circle_selected.png
index 74690705f..74690705f 100644
--- a/res/drawable-hdpi-finger/btn_circle_selected.png
+++ b/res/drawable-hdpi-finger-v4/btn_circle_selected.png
diff --git a/res/drawable-hdpi-finger/ic_btn_round_minus.png b/res/drawable-hdpi-finger-v4/ic_btn_round_minus.png
index 27af3faf4..27af3faf4 100644
--- a/res/drawable-hdpi-finger/ic_btn_round_minus.png
+++ b/res/drawable-hdpi-finger-v4/ic_btn_round_minus.png
diff --git a/res/drawable-hdpi-finger/ic_btn_round_plus.png b/res/drawable-hdpi-finger-v4/ic_btn_round_plus.png
index b24168c32..b24168c32 100644
--- a/res/drawable-hdpi-finger/ic_btn_round_plus.png
+++ b/res/drawable-hdpi-finger-v4/ic_btn_round_plus.png
diff --git a/res/drawable-hdpi/encrypted.png b/res/drawable-hdpi-v4/encrypted.png
index 6d7c616a4..6d7c616a4 100644
--- a/res/drawable-hdpi/encrypted.png
+++ b/res/drawable-hdpi-v4/encrypted.png
diff --git a/res/drawable-hdpi/encrypted_large.png b/res/drawable-hdpi-v4/encrypted_large.png
index dc7466e45..dc7466e45 100644
--- a/res/drawable-hdpi/encrypted_large.png
+++ b/res/drawable-hdpi-v4/encrypted_large.png
diff --git a/res/drawable-hdpi/encrypted_small.png b/res/drawable-hdpi-v4/encrypted_small.png
index 5ed9fe4b8..5ed9fe4b8 100644
--- a/res/drawable-hdpi/encrypted_small.png
+++ b/res/drawable-hdpi-v4/encrypted_small.png
diff --git a/res/drawable-hdpi-v4/ic_next.png b/res/drawable-hdpi-v4/ic_next.png
new file mode 100644
index 000000000..d71058055
--- /dev/null
+++ b/res/drawable-hdpi-v4/ic_next.png
diff --git a/res/drawable-hdpi-v4/ic_previous.png b/res/drawable-hdpi-v4/ic_previous.png
new file mode 100644
index 000000000..d610e4667
--- /dev/null
+++ b/res/drawable-hdpi-v4/ic_previous.png
diff --git a/res/drawable-hdpi/icon.png b/res/drawable-hdpi-v4/icon.png
index 9e2e7c0e4..9e2e7c0e4 100644
--- a/res/drawable-hdpi/icon.png
+++ b/res/drawable-hdpi-v4/icon.png
diff --git a/res/drawable-hdpi/key.png b/res/drawable-hdpi-v4/key.png
index 6f18c0240..6f18c0240 100644
--- a/res/drawable-hdpi/key.png
+++ b/res/drawable-hdpi-v4/key.png
diff --git a/res/drawable-hdpi/key_large.png b/res/drawable-hdpi-v4/key_large.png
index 81816835d..81816835d 100644
--- a/res/drawable-hdpi/key_large.png
+++ b/res/drawable-hdpi-v4/key_large.png
diff --git a/res/drawable-hdpi/key_small.png b/res/drawable-hdpi-v4/key_small.png
index 3f42a0d9b..3f42a0d9b 100644
--- a/res/drawable-hdpi/key_small.png
+++ b/res/drawable-hdpi-v4/key_small.png
diff --git a/res/drawable-hdpi/overlay_error.png b/res/drawable-hdpi-v4/overlay_error.png
index db6a08329..db6a08329 100644
--- a/res/drawable-hdpi/overlay_error.png
+++ b/res/drawable-hdpi-v4/overlay_error.png
diff --git a/res/drawable-hdpi/overlay_ok.png b/res/drawable-hdpi-v4/overlay_ok.png
index 33dc08094..33dc08094 100644
--- a/res/drawable-hdpi/overlay_ok.png
+++ b/res/drawable-hdpi-v4/overlay_ok.png
diff --git a/res/drawable-hdpi/signed.png b/res/drawable-hdpi-v4/signed.png
index 92e64dc51..92e64dc51 100644
--- a/res/drawable-hdpi/signed.png
+++ b/res/drawable-hdpi-v4/signed.png
diff --git a/res/drawable-hdpi/signed_large.png b/res/drawable-hdpi-v4/signed_large.png
index 53d8ac991..53d8ac991 100644
--- a/res/drawable-hdpi/signed_large.png
+++ b/res/drawable-hdpi-v4/signed_large.png
diff --git a/res/drawable-hdpi/signed_small.png b/res/drawable-hdpi-v4/signed_small.png
index d7f147f05..d7f147f05 100644
--- a/res/drawable-hdpi/signed_small.png
+++ b/res/drawable-hdpi-v4/signed_small.png
diff --git a/res/drawable-ldpi/encrypted.png b/res/drawable-ldpi-v4/encrypted.png
index 7f4ab803f..7f4ab803f 100644
--- a/res/drawable-ldpi/encrypted.png
+++ b/res/drawable-ldpi-v4/encrypted.png
diff --git a/res/drawable-ldpi/encrypted_large.png b/res/drawable-ldpi-v4/encrypted_large.png
index 2783804bc..2783804bc 100644
--- a/res/drawable-ldpi/encrypted_large.png
+++ b/res/drawable-ldpi-v4/encrypted_large.png
diff --git a/res/drawable-ldpi/encrypted_small.png b/res/drawable-ldpi-v4/encrypted_small.png
index 0ffedf2dd..0ffedf2dd 100644
--- a/res/drawable-ldpi/encrypted_small.png
+++ b/res/drawable-ldpi-v4/encrypted_small.png
diff --git a/res/drawable-ldpi-v4/ic_next.png b/res/drawable-ldpi-v4/ic_next.png
new file mode 100644
index 000000000..474ed8faa
--- /dev/null
+++ b/res/drawable-ldpi-v4/ic_next.png
diff --git a/res/drawable-ldpi-v4/ic_previous.png b/res/drawable-ldpi-v4/ic_previous.png
new file mode 100644
index 000000000..6fd885e6b
--- /dev/null
+++ b/res/drawable-ldpi-v4/ic_previous.png
diff --git a/res/drawable-ldpi/icon.png b/res/drawable-ldpi-v4/icon.png
index 9d44341f1..9d44341f1 100644
--- a/res/drawable-ldpi/icon.png
+++ b/res/drawable-ldpi-v4/icon.png
diff --git a/res/drawable-ldpi/key.png b/res/drawable-ldpi-v4/key.png
index 121803508..121803508 100644
--- a/res/drawable-ldpi/key.png
+++ b/res/drawable-ldpi-v4/key.png
diff --git a/res/drawable-ldpi/key_large.png b/res/drawable-ldpi-v4/key_large.png
index de7e72524..de7e72524 100644
--- a/res/drawable-ldpi/key_large.png
+++ b/res/drawable-ldpi-v4/key_large.png
diff --git a/res/drawable-ldpi/key_small.png b/res/drawable-ldpi-v4/key_small.png
index 1763c4256..1763c4256 100644
--- a/res/drawable-ldpi/key_small.png
+++ b/res/drawable-ldpi-v4/key_small.png
diff --git a/res/drawable-ldpi/overlay_error.png b/res/drawable-ldpi-v4/overlay_error.png
index 568f2b1ee..568f2b1ee 100644
--- a/res/drawable-ldpi/overlay_error.png
+++ b/res/drawable-ldpi-v4/overlay_error.png
diff --git a/res/drawable-ldpi/overlay_ok.png b/res/drawable-ldpi-v4/overlay_ok.png
index db415a846..db415a846 100644
--- a/res/drawable-ldpi/overlay_ok.png
+++ b/res/drawable-ldpi-v4/overlay_ok.png
diff --git a/res/drawable-ldpi/signed.png b/res/drawable-ldpi-v4/signed.png
index 590220281..590220281 100644
--- a/res/drawable-ldpi/signed.png
+++ b/res/drawable-ldpi-v4/signed.png
diff --git a/res/drawable-ldpi/signed_large.png b/res/drawable-ldpi-v4/signed_large.png
index 490e94fbd..490e94fbd 100644
--- a/res/drawable-ldpi/signed_large.png
+++ b/res/drawable-ldpi-v4/signed_large.png
diff --git a/res/drawable-ldpi/signed_small.png b/res/drawable-ldpi-v4/signed_small.png
index ca33fc1f7..ca33fc1f7 100644
--- a/res/drawable-ldpi/signed_small.png
+++ b/res/drawable-ldpi-v4/signed_small.png
diff --git a/res/drawable-mdpi-finger/btn_circle_disable.png b/res/drawable-mdpi-finger-v4/btn_circle_disable.png
index 33b74a66c..33b74a66c 100644
--- a/res/drawable-mdpi-finger/btn_circle_disable.png
+++ b/res/drawable-mdpi-finger-v4/btn_circle_disable.png
diff --git a/res/drawable-mdpi-finger/btn_circle_disable_focused.png b/res/drawable-mdpi-finger-v4/btn_circle_disable_focused.png
index 005ad8dca..005ad8dca 100644
--- a/res/drawable-mdpi-finger/btn_circle_disable_focused.png
+++ b/res/drawable-mdpi-finger-v4/btn_circle_disable_focused.png
diff --git a/res/drawable-mdpi-finger/btn_circle_normal.png b/res/drawable-mdpi-finger-v4/btn_circle_normal.png
index fc5af1c9f..fc5af1c9f 100644
--- a/res/drawable-mdpi-finger/btn_circle_normal.png
+++ b/res/drawable-mdpi-finger-v4/btn_circle_normal.png
diff --git a/res/drawable-mdpi-finger/btn_circle_pressed.png b/res/drawable-mdpi-finger-v4/btn_circle_pressed.png
index 8f40afdfc..8f40afdfc 100644
--- a/res/drawable-mdpi-finger/btn_circle_pressed.png
+++ b/res/drawable-mdpi-finger-v4/btn_circle_pressed.png
diff --git a/res/drawable-mdpi-finger/btn_circle_selected.png b/res/drawable-mdpi-finger-v4/btn_circle_selected.png
index c74fac227..c74fac227 100644
--- a/res/drawable-mdpi-finger/btn_circle_selected.png
+++ b/res/drawable-mdpi-finger-v4/btn_circle_selected.png
diff --git a/res/drawable-mdpi-finger/ic_btn_round_minus.png b/res/drawable-mdpi-finger-v4/ic_btn_round_minus.png
index 96dbb17d2..96dbb17d2 100644
--- a/res/drawable-mdpi-finger/ic_btn_round_minus.png
+++ b/res/drawable-mdpi-finger-v4/ic_btn_round_minus.png
diff --git a/res/drawable-mdpi-finger/ic_btn_round_plus.png b/res/drawable-mdpi-finger-v4/ic_btn_round_plus.png
index 1ec8a956a..1ec8a956a 100644
--- a/res/drawable-mdpi-finger/ic_btn_round_plus.png
+++ b/res/drawable-mdpi-finger-v4/ic_btn_round_plus.png
diff --git a/res/drawable-mdpi/encrypted.png b/res/drawable-mdpi-v4/encrypted.png
index 2783804bc..2783804bc 100644
--- a/res/drawable-mdpi/encrypted.png
+++ b/res/drawable-mdpi-v4/encrypted.png
diff --git a/res/drawable-mdpi/encrypted_large.png b/res/drawable-mdpi-v4/encrypted_large.png
index 6d7c616a4..6d7c616a4 100644
--- a/res/drawable-mdpi/encrypted_large.png
+++ b/res/drawable-mdpi-v4/encrypted_large.png
diff --git a/res/drawable-mdpi/encrypted_small.png b/res/drawable-mdpi-v4/encrypted_small.png
index 7f4ab803f..7f4ab803f 100644
--- a/res/drawable-mdpi/encrypted_small.png
+++ b/res/drawable-mdpi-v4/encrypted_small.png
diff --git a/res/drawable-mdpi-v4/ic_next.png b/res/drawable-mdpi-v4/ic_next.png
new file mode 100644
index 000000000..8271c1380
--- /dev/null
+++ b/res/drawable-mdpi-v4/ic_next.png
diff --git a/res/drawable-mdpi-v4/ic_previous.png b/res/drawable-mdpi-v4/ic_previous.png
new file mode 100644
index 000000000..ef90db972
--- /dev/null
+++ b/res/drawable-mdpi-v4/ic_previous.png
diff --git a/res/drawable-mdpi/icon.png b/res/drawable-mdpi-v4/icon.png
index b4e4db40e..b4e4db40e 100644
--- a/res/drawable-mdpi/icon.png
+++ b/res/drawable-mdpi-v4/icon.png
diff --git a/res/drawable-mdpi/key.png b/res/drawable-mdpi-v4/key.png
index de7e72524..de7e72524 100644
--- a/res/drawable-mdpi/key.png
+++ b/res/drawable-mdpi-v4/key.png
diff --git a/res/drawable-mdpi/key_large.png b/res/drawable-mdpi-v4/key_large.png
index 6f18c0240..6f18c0240 100644
--- a/res/drawable-mdpi/key_large.png
+++ b/res/drawable-mdpi-v4/key_large.png
diff --git a/res/drawable-mdpi/key_small.png b/res/drawable-mdpi-v4/key_small.png
index 121803508..121803508 100644
--- a/res/drawable-mdpi/key_small.png
+++ b/res/drawable-mdpi-v4/key_small.png
diff --git a/res/drawable-mdpi/overlay_error.png b/res/drawable-mdpi-v4/overlay_error.png
index 2372de59e..2372de59e 100644
--- a/res/drawable-mdpi/overlay_error.png
+++ b/res/drawable-mdpi-v4/overlay_error.png
diff --git a/res/drawable-mdpi/overlay_ok.png b/res/drawable-mdpi-v4/overlay_ok.png
index 2f0005898..2f0005898 100644
--- a/res/drawable-mdpi/overlay_ok.png
+++ b/res/drawable-mdpi-v4/overlay_ok.png
diff --git a/res/drawable-mdpi/signed.png b/res/drawable-mdpi-v4/signed.png
index 490e94fbd..490e94fbd 100644
--- a/res/drawable-mdpi/signed.png
+++ b/res/drawable-mdpi-v4/signed.png
diff --git a/res/drawable-mdpi/signed_large.png b/res/drawable-mdpi-v4/signed_large.png
index 92e64dc51..92e64dc51 100644
--- a/res/drawable-mdpi/signed_large.png
+++ b/res/drawable-mdpi-v4/signed_large.png
diff --git a/res/drawable-mdpi/signed_small.png b/res/drawable-mdpi-v4/signed_small.png
index 590220281..590220281 100644
--- a/res/drawable-mdpi/signed_small.png
+++ b/res/drawable-mdpi-v4/signed_small.png
diff --git a/res/drawable/btn_circle_disable.png b/res/drawable/btn_circle_disable.png
new file mode 100644
index 000000000..33b74a66c
--- /dev/null
+++ b/res/drawable/btn_circle_disable.png
diff --git a/res/drawable/btn_circle_disable_focused.png b/res/drawable/btn_circle_disable_focused.png
new file mode 100644
index 000000000..005ad8dca
--- /dev/null
+++ b/res/drawable/btn_circle_disable_focused.png
diff --git a/res/drawable/btn_circle_normal.png b/res/drawable/btn_circle_normal.png
new file mode 100644
index 000000000..fc5af1c9f
--- /dev/null
+++ b/res/drawable/btn_circle_normal.png
diff --git a/res/drawable/btn_circle_pressed.png b/res/drawable/btn_circle_pressed.png
new file mode 100644
index 000000000..8f40afdfc
--- /dev/null
+++ b/res/drawable/btn_circle_pressed.png
diff --git a/res/drawable/btn_circle_selected.png b/res/drawable/btn_circle_selected.png
new file mode 100644
index 000000000..c74fac227
--- /dev/null
+++ b/res/drawable/btn_circle_selected.png
diff --git a/res/drawable/encrypted.png b/res/drawable/encrypted.png
new file mode 100644
index 000000000..2783804bc
--- /dev/null
+++ b/res/drawable/encrypted.png
diff --git a/res/drawable/encrypted_large.png b/res/drawable/encrypted_large.png
new file mode 100644
index 000000000..6d7c616a4
--- /dev/null
+++ b/res/drawable/encrypted_large.png
diff --git a/res/drawable/encrypted_small.png b/res/drawable/encrypted_small.png
new file mode 100644
index 000000000..7f4ab803f
--- /dev/null
+++ b/res/drawable/encrypted_small.png
diff --git a/res/drawable/ic_btn_round_minus.png b/res/drawable/ic_btn_round_minus.png
new file mode 100644
index 000000000..96dbb17d2
--- /dev/null
+++ b/res/drawable/ic_btn_round_minus.png
diff --git a/res/drawable/ic_btn_round_plus.png b/res/drawable/ic_btn_round_plus.png
new file mode 100644
index 000000000..1ec8a956a
--- /dev/null
+++ b/res/drawable/ic_btn_round_plus.png
diff --git a/res/drawable/ic_launcher_folder.png b/res/drawable/ic_launcher_folder.png
new file mode 100644
index 000000000..ed31ba580
--- /dev/null
+++ b/res/drawable/ic_launcher_folder.png
diff --git a/res/drawable/ic_launcher_folder_small.png b/res/drawable/ic_launcher_folder_small.png
new file mode 100644
index 000000000..5df8d60f0
--- /dev/null
+++ b/res/drawable/ic_launcher_folder_small.png
diff --git a/res/drawable/ic_next.png b/res/drawable/ic_next.png
new file mode 100644
index 000000000..8271c1380
--- /dev/null
+++ b/res/drawable/ic_next.png
diff --git a/res/drawable/ic_previous.png b/res/drawable/ic_previous.png
new file mode 100644
index 000000000..ef90db972
--- /dev/null
+++ b/res/drawable/ic_previous.png
diff --git a/res/drawable/icon.png b/res/drawable/icon.png
new file mode 100644
index 000000000..b4e4db40e
--- /dev/null
+++ b/res/drawable/icon.png
diff --git a/res/drawable/key.png b/res/drawable/key.png
new file mode 100644
index 000000000..de7e72524
--- /dev/null
+++ b/res/drawable/key.png
diff --git a/res/drawable/key_large.png b/res/drawable/key_large.png
new file mode 100644
index 000000000..6f18c0240
--- /dev/null
+++ b/res/drawable/key_large.png
diff --git a/res/drawable/key_small.png b/res/drawable/key_small.png
new file mode 100644
index 000000000..121803508
--- /dev/null
+++ b/res/drawable/key_small.png
diff --git a/res/drawable/overlay_error.png b/res/drawable/overlay_error.png
new file mode 100644
index 000000000..2372de59e
--- /dev/null
+++ b/res/drawable/overlay_error.png
diff --git a/res/drawable/overlay_ok.png b/res/drawable/overlay_ok.png
new file mode 100644
index 000000000..2f0005898
--- /dev/null
+++ b/res/drawable/overlay_ok.png
diff --git a/res/drawable/signed.png b/res/drawable/signed.png
new file mode 100644
index 000000000..490e94fbd
--- /dev/null
+++ b/res/drawable/signed.png
diff --git a/res/drawable/signed_large.png b/res/drawable/signed_large.png
new file mode 100644
index 000000000..92e64dc51
--- /dev/null
+++ b/res/drawable/signed_large.png
diff --git a/res/drawable/signed_small.png b/res/drawable/signed_small.png
new file mode 100644
index 000000000..590220281
--- /dev/null
+++ b/res/drawable/signed_small.png
diff --git a/res/layout/account_item.xml b/res/layout/account_item.xml
index e37000ff0..0aa76719a 100644
--- a/res/layout/account_item.xml
+++ b/res/layout/account_item.xml
@@ -24,12 +24,12 @@
     android:layout_width="fill_parent"
     android:layout_height="?android:attr/listPreferredItemHeight">
 
-<TextView
-    android:id="@+id/account_name"
-    android:text="someone@gmail.com"
-    android:textAppearance="?android:attr/textAppearanceLarge"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:layout_gravity="center_vertical"/>
+    <TextView
+        android:id="@+id/accountName"
+        android:text="someone@gmail.com"
+        android:textAppearance="?android:attr/textAppearanceLarge"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"/>
 
 </LinearLayout>
diff --git a/res/layout/create_key.xml b/res/layout/create_key.xml
index 569b703f5..ab327ffeb 100644
--- a/res/layout/create_key.xml
+++ b/res/layout/create_key.xml
@@ -18,35 +18,47 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_height="fill_parent"
     android:layout_width="fill_parent">
+
         <TableLayout
             android:layout_height="fill_parent"
             android:layout_width="fill_parent"
             android:stretchColumns="1"
             android:layout_marginRight="?android:attr/scrollbarSize"
             android:paddingLeft="6dip">
+
             <TableRow>
+
                 <TextView android:id="@+id/label_algorithm"
                           android:text="Algorithm"
                           android:layout_height="wrap_content"
                           android:layout_width="wrap_content"
                           android:layout_gravity="center_vertical"
                           android:paddingRight="10dip"/>
+
                 <Spinner
                     android:id="@+id/algorithm"
                     android:layout_width="fill_parent"
                     android:layout_height="wrap_content"/>
+
             </TableRow>
+
             <TableRow>
+
                 <TextView android:id="@+id/label_size"
                           android:text="Key Size"
                           android:layout_height="wrap_content"
                           android:layout_width="wrap_content"
                           android:layout_gravity="center_vertical"
                           android:paddingRight="10dip"/>
+
                 <EditText android:id="@+id/size"
                           android:text="1024"
                           android:layout_height="wrap_content"
-                          android:layout_width="fill_parent" android:gravity="right" android:numeric="integer"/>
+                          android:layout_width="fill_parent"
+                          android:gravity="right"
+                          android:numeric="integer"/>
             </TableRow>
+
         </TableLayout>
+
 </ScrollView>
diff --git a/res/layout/decrypt.xml b/res/layout/decrypt.xml
new file mode 100644
index 000000000..03e2f6311
--- /dev/null
+++ b/res/layout/decrypt.xml
@@ -0,0 +1,214 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 Thialfihar <thi@thialfihar.org>
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:fillViewport="true">
+
+    <ScrollView
+        android:layout_width="fill_parent"
+        android:layout_height="0dip"
+        android:layout_weight="1"
+        android:fillViewport="true">
+
+        <LinearLayout
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"
+            android:orientation="vertical"
+            android:layout_marginLeft="5dip">
+
+            <LinearLayout
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">
+
+                <ImageView
+                    android:id="@+id/sourcePrevious"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_previous"/>
+
+                <TextView
+                    android:id="@+id/sourceLabel"
+                    android:layout_width="0dip"
+                    android:layout_height="fill_parent"
+                    android:layout_weight="1"
+                    android:text="@string/label_message"
+                    android:textAppearance="?android:attr/textAppearanceMedium"
+                    android:gravity="center_horizontal|center_vertical"
+                    android:textColor="#ffffffff"/>
+
+                <ImageView
+                    android:id="@+id/sourceNext"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_next"/>
+
+            </LinearLayout>
+
+            <ViewFlipper
+                android:id="@+id/source"
+                android:layout_width="fill_parent"
+                android:layout_height="0dip"
+                android:layout_weight="1">
+
+                <LinearLayout
+                    android:id="@+id/sourceMessage"
+                    android:layout_width="fill_parent"
+                    android:layout_height="fill_parent"
+                    android:orientation="vertical">
+
+                    <EditText
+                        android:id="@+id/message"
+                        android:inputType="text|textCapSentences|textMultiLine|textLongMessage"
+                        android:layout_width="fill_parent"
+                        android:layout_height="fill_parent"
+                        android:gravity="top"/>
+
+                </LinearLayout>
+
+                <LinearLayout
+                    android:id="@+id/sourceFile"
+                    android:layout_width="fill_parent"
+                    android:layout_height="fill_parent"
+                    android:orientation="vertical">
+
+                    <LinearLayout
+                        android:layout_width="fill_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="horizontal">
+
+                        <EditText
+                            android:id="@+id/filename"
+                            android:layout_width="0dip"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"/>
+
+                        <ImageButton
+                            android:id="@+id/btn_browse"
+                            android:src="@drawable/ic_launcher_folder_small"
+                            android:layout_height="wrap_content"
+                            android:layout_width="wrap_content"/>
+
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:layout_width="fill_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="horizontal">
+
+                        <TextView
+                            android:id="@+id/label_deleteAfterDecryption"
+                            android:text="@string/label_deleteAfterDecryption"
+                            android:textAppearance="?android:attr/textAppearanceMedium"
+                            android:layout_gravity="center_vertical"
+                            android:paddingRight="10dip"
+                            android:layout_height="wrap_content"
+                            android:layout_width="0dip"
+                            android:layout_weight="1"/>
+
+                        <CheckBox
+                            android:id="@+id/deleteAfterDecryption"
+                            android:layout_height="wrap_content"
+                            android:layout_width="wrap_content"
+                            android:layout_gravity="center_vertical"/>
+
+                    </LinearLayout>
+
+                </LinearLayout>
+
+            </ViewFlipper>
+
+        </LinearLayout>
+
+    </ScrollView>
+
+    <LinearLayout
+        android:id="@+id/signature"
+        android:orientation="horizontal"
+        android:layout_height="wrap_content"
+        android:layout_width="fill_parent">
+
+        <RelativeLayout
+            android:layout_height="wrap_content"
+            android:layout_width="wrap_content">
+
+            <ImageView
+                android:id="@+id/ic_signature"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:src="@drawable/signed_large"/>
+
+            <ImageView
+                android:id="@+id/ic_signature_status"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:src="@drawable/overlay_error"/>
+
+        </RelativeLayout>
+
+        <LinearLayout
+            android:orientation="vertical"
+            android:layout_height="wrap_content"
+            android:layout_width="wrap_content"
+            android:paddingLeft="5dip">
+
+            <TextView
+                android:id="@+id/mainUserId"
+                android:text="Main User Id"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="left"/>
+
+            <TextView
+                android:id="@+id/mainUserIdRest"
+                android:text="Main User Id Rest"
+                android:textAppearance="?android:attr/textAppearanceSmall"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="left"/>
+
+        </LinearLayout>
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:orientation="horizontal"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        style="@android:style/ButtonBar">
+
+        <Button
+            android:id="@+id/btn_reply"
+            android:text="@string/btn_reply"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"/>
+
+        <Button
+            android:id="@+id/btn_decrypt"
+            android:text="@string/btn_decrypt"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"/>
+
+    </LinearLayout>
+
+</LinearLayout>
diff --git a/res/layout/decrypt_message.xml b/res/layout/decrypt_message.xml
deleted file mode 100644
index 2a0aa153d..000000000
--- a/res/layout/decrypt_message.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 Thialfihar <thi@thialfihar.org>
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:fillViewport="true">
-
-<EditText
-    android:id="@+id/message"
-    android:inputType="text|textCapSentences|textMultiLine|textLongMessage"
-    android:layout_width="fill_parent"
-    android:layout_height="0dip"
-    android:layout_weight="1"
-    android:gravity="top"/>
-
-<LinearLayout
-    android:orientation="horizontal"
-    android:layout_height="wrap_content"
-    android:layout_width="fill_parent"
-    android:paddingLeft="5dip"
-    android:paddingRight="5dip">
-
-<LinearLayout
-    android:id="@+id/layout_signature"
-    android:orientation="horizontal"
-    android:layout_height="wrap_content"
-    android:layout_width="wrap_content"
-    android:layout_weight="2">
-
-<RelativeLayout
-    android:layout_height="wrap_content"
-    android:layout_width="wrap_content">
-<ImageView
-    android:id="@+id/ic_signature"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:src="@drawable/signed_large"/>
-
-<ImageView
-    android:id="@+id/ic_signature_status"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:src="@drawable/overlay_error"/>
-
-</RelativeLayout>
-
-<LinearLayout
-    android:orientation="vertical"
-    android:layout_height="wrap_content"
-    android:layout_width="wrap_content"
-    android:paddingLeft="5dip">
-
-<TextView
-    android:id="@+id/main_user_id"
-    android:text="Main User Id"
-    android:textAppearance="?android:attr/textAppearanceMedium"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:layout_gravity="left"/>
-
-<TextView
-    android:id="@+id/main_user_id_rest"
-    android:text="Main User Id Rest"
-    android:textAppearance="?android:attr/textAppearanceSmall"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content" android:layout_gravity="left"/>
-
-</LinearLayout>
-</LinearLayout>
-
-<Button
-    android:id="@+id/btn_decrypt"
-    android:text="@string/btn_decrypt"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:layout_weight="1"/>
-
-</LinearLayout>
-
-</LinearLayout>
-
diff --git a/res/layout/edit_key.xml b/res/layout/edit_key.xml
index 2fceeb5a3..bf994fa44 100644
--- a/res/layout/edit_key.xml
+++ b/res/layout/edit_key.xml
@@ -22,19 +22,21 @@
     android:paddingTop="5dip"
     android:fillViewport="true">
 
-<ScrollView
-  android:layout_width="fill_parent"
-  android:layout_height="0dip"
-  android:layout_weight="1">
-<LinearLayout
-  android:id="@+id/container"
-  android:layout_width="fill_parent"
-  android:layout_height="fill_parent"
-  android:orientation="vertical"
-  android:layout_marginRight="?android:attr/scrollbarSize"/>
-</ScrollView>
+    <ScrollView
+        android:layout_width="fill_parent"
+        android:layout_height="0dip"
+        android:layout_weight="1">
 
-<LinearLayout
+        <LinearLayout
+            android:id="@+id/container"
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"
+            android:orientation="vertical"
+            android:layout_marginRight="?android:attr/scrollbarSize"/>
+
+    </ScrollView>
+
+    <LinearLayout
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal"
@@ -53,6 +55,7 @@
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:text="@string/btn_doNotSave"/>
-</LinearLayout>
+
+    </LinearLayout>
 
 </LinearLayout>
diff --git a/res/layout/edit_key_key_item.xml b/res/layout/edit_key_key_item.xml
index 46de4a977..ba428938e 100644
--- a/res/layout/edit_key_key_item.xml
+++ b/res/layout/edit_key_key_item.xml
@@ -15,99 +15,129 @@
 -->
 
 <org.thialfihar.android.apg.ui.widget.KeyEditor
-  xmlns:android="http://schemas.android.com/apk/res/android"
-  android:layout_width="fill_parent"
-  android:layout_height="wrap_content"
-  android:orientation="vertical"
-  android:paddingLeft="5dip">
-
-<View
-  android:id="@+id/separator"
-  android:layout_width="fill_parent"
-  android:layout_height="1dip"
-  android:background="?android:attr/listDivider"/>
-
-<LinearLayout
-  android:layout_height="wrap_content"
-  android:layout_width="fill_parent"
-  android:orientation="horizontal">
-    <TableLayout
-      android:layout_height="wrap_content"
-      android:layout_width="0dip"
-      android:layout_weight="1"
-      android:layout_marginLeft="16dip"
-      android:stretchColumns="1">
-        <TableRow>
-            <TextView android:id="@+id/label_key_id" android:text="Key ID"
-                      android:layout_height="wrap_content"
-                      android:layout_width="wrap_content"
-                      android:layout_gravity="center_vertical"
-                      android:paddingRight="10dip"/>
-            <TextView
-                android:id="@+id/key_id"
-                android:text="00000000 00000000"
-                android:layout_height="wrap_content"
-                android:layout_width="wrap_content"
-                android:paddingRight="5dip"
-                android:typeface="monospace"/>
-        </TableRow>
-        <TableRow>
-            <TextView android:id="@+id/label_algorithm"
-                      android:text="Algorithm"
-                      android:layout_height="wrap_content"
-                      android:layout_width="wrap_content"
-                      android:layout_gravity="center_vertical"
-                      android:paddingRight="10dip"/>
-            <TextView android:id="@+id/algorithm"
-                      android:text="Name"
-                      android:layout_height="wrap_content"
-                      android:layout_width="wrap_content"
-                      android:paddingRight="5dip"/>
-        </TableRow>
-        <TableRow>
-            <TextView android:id="@+id/label_creation"
-                      android:text="Creation"
-                      android:layout_height="wrap_content"
-                      android:layout_width="wrap_content"
-                      android:layout_gravity="center_vertical"
-                      android:paddingRight="10dip"/>
-            <TextView
-                android:id="@+id/creation"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"/>
-        </TableRow>
-        <TableRow>
-            <TextView android:id="@+id/label_expiry"
-                      android:text="Expiry"
-                      android:layout_height="wrap_content"
-                      android:layout_width="wrap_content"
-                      android:layout_gravity="center_vertical"
-                      android:paddingRight="10dip"/>
-            <Button
-                android:id="@+id/expiry"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"/>
-        </TableRow>
-        <TableRow>
-            <TextView android:id="@+id/label_usage"
-                      android:text="Usage"
-                      android:layout_height="wrap_content"
-                      android:layout_width="wrap_content"
-                      android:layout_gravity="center_vertical"
-                      android:paddingRight="10dip"/>
-            <Spinner
-                android:id="@+id/usage"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"/>
-        </TableRow>
-    </TableLayout>
-
-    <ImageButton
-        android:id="@+id/edit_delete"
-        android:layout_width="wrap_content"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:paddingLeft="5dip">
+
+    <View
+        android:id="@+id/separator"
+        android:layout_width="fill_parent"
+        android:layout_height="1dip"
+        android:background="?android:attr/listDivider"/>
+
+    <LinearLayout
         android:layout_height="wrap_content"
-        style="@style/MinusButton"
-        android:layout_gravity="center_vertical"/>
+        android:layout_width="fill_parent"
+        android:orientation="horizontal">
+
+        <TableLayout
+            android:layout_height="wrap_content"
+            android:layout_width="0dip"
+            android:layout_weight="1"
+            android:layout_marginLeft="16dip"
+            android:stretchColumns="1">
+
+            <TableRow>
+
+                <TextView
+                   android:id="@+id/label_keyId"
+                   android:text="Key ID"
+                   android:layout_height="wrap_content"
+                   android:layout_width="wrap_content"
+                   android:layout_gravity="center_vertical"
+                   android:paddingRight="10dip"/>
+
+                <TextView
+                    android:id="@+id/keyId"
+                    android:text="00000000 00000000"
+                    android:layout_height="wrap_content"
+                    android:layout_width="wrap_content"
+                    android:paddingRight="5dip"
+                    android:typeface="monospace"/>
+
+            </TableRow>
+
+            <TableRow>
+
+                <TextView
+                    android:id="@+id/label_algorithm"
+                    android:text="Algorithm"
+                    android:layout_height="wrap_content"
+                    android:layout_width="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:paddingRight="10dip"/>
+
+                <TextView
+                    android:id="@+id/algorithm"
+                    android:text="Name"
+                    android:layout_height="wrap_content"
+                    android:layout_width="wrap_content"
+                    android:paddingRight="5dip"/>
+
+            </TableRow>
+
+            <TableRow>
+
+                <TextView
+                    android:id="@+id/label_creation"
+                    android:text="Creation"
+                    android:layout_height="wrap_content"
+                    android:layout_width="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:paddingRight="10dip"/>
+
+                <TextView
+                    android:id="@+id/creation"
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"/>
+
+            </TableRow>
+
+            <TableRow>
+
+                <TextView
+                    android:id="@+id/label_expiry"
+                    android:text="Expiry"
+                    android:layout_height="wrap_content"
+                    android:layout_width="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:paddingRight="10dip"/>
+
+                <Button
+                    android:id="@+id/expiry"
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"/>
+
+            </TableRow>
+
+            <TableRow>
+
+                <TextView
+                    android:id="@+id/label_usage"
+                    android:text="Usage"
+                    android:layout_height="wrap_content"
+                    android:layout_width="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:paddingRight="10dip"/>
+
+                <Spinner
+                    android:id="@+id/usage"
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"/>
+
+            </TableRow>
+
+        </TableLayout>
+
+        <ImageButton
+            android:id="@+id/delete"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            style="@style/MinusButton"
+            android:layout_gravity="center_vertical"/>
+
+    </LinearLayout>
 
-</LinearLayout>
 </org.thialfihar.android.apg.ui.widget.KeyEditor>
diff --git a/res/layout/edit_key_section.xml b/res/layout/edit_key_section.xml
index b3a48f87e..e57b3b8df 100644
--- a/res/layout/edit_key_section.xml
+++ b/res/layout/edit_key_section.xml
@@ -15,7 +15,7 @@
 -->
 
 <org.thialfihar.android.apg.ui.widget.SectionView
-  xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical">
diff --git a/res/layout/edit_key_user_id_item.xml b/res/layout/edit_key_user_id_item.xml
index 998c436cb..6164cf767 100644
--- a/res/layout/edit_key_user_id_item.xml
+++ b/res/layout/edit_key_user_id_item.xml
@@ -15,82 +15,99 @@
 -->
 
 <org.thialfihar.android.apg.ui.widget.UserIdEditor
-  xmlns:android="http://schemas.android.com/apk/res/android"
-  android:layout_width="fill_parent"
-  android:layout_height="wrap_content"
-  android:orientation="vertical"
-  android:paddingLeft="5dip">
-
-<View
-  android:id="@+id/separator"
-  android:layout_width="fill_parent"
-  android:layout_height="1dip"
-  android:background="?android:attr/listDivider"/>
-
-<RadioButton
-  android:id="@+id/is_main_user_id" android:text="Main User ID"
-  android:layout_height="wrap_content" android:layout_width="wrap_content"
-  android:layout_marginLeft="20dip"/>
-
-<LinearLayout
-  android:layout_height="wrap_content"
-  android:layout_width="fill_parent"
-  android:orientation="horizontal">
-    <TableLayout
-      android:layout_height="wrap_content"
-      android:layout_width="0dip"
-      android:layout_weight="1"
-      android:layout_marginLeft="16dip">
-        <TableRow>
-            <TextView
-              android:id="@+id/name_label"
-              android:text="Name"
-              android:layout_gravity="center_vertical"
-              android:layout_height="wrap_content"
-              android:layout_width="wrap_content"
-              android:paddingRight="5dip"/>
-            <EditText
-              android:id="@+id/name"
-              android:layout_weight="1"
-              android:layout_height="wrap_content"
-              android:layout_width="fill_parent"/>
-        </TableRow>
-        <TableRow>
-            <TextView
-              android:id="@+id/email_label"
-              android:text="Email"
-              android:layout_gravity="center_vertical"
-              android:layout_height="wrap_content"
-              android:layout_width="wrap_content"
-              android:paddingRight="5dip"/>
-            <EditText
-              android:id="@+id/email"
-              android:layout_weight="1"
-              android:layout_height="wrap_content"
-              android:layout_width="fill_parent"/>
-        </TableRow>
-        <TableRow>
-            <TextView
-              android:id="@+id/comment_label"
-              android:text="Comment"
-              android:layout_gravity="center_vertical"
-              android:layout_height="wrap_content"
-              android:layout_width="wrap_content"
-              android:paddingRight="5dip"/>
-            <EditText
-              android:id="@+id/comment"
-              android:layout_weight="1"
-              android:layout_height="wrap_content"
-              android:layout_width="fill_parent"/>
-        </TableRow>
-    </TableLayout>
-
-    <ImageButton
-        android:id="@+id/edit_delete"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:paddingLeft="5dip">
+
+    <View
+        android:id="@+id/separator"
+        android:layout_width="fill_parent"
+        android:layout_height="1dip"
+        android:background="?android:attr/listDivider"/>
+
+    <RadioButton
+        android:id="@+id/isMainUserId"
+        android:text="Main User ID"
+        android:layout_height="wrap_content"
         android:layout_width="wrap_content"
+        android:layout_marginLeft="20dip"/>
+
+    <LinearLayout
         android:layout_height="wrap_content"
-        style="@style/MinusButton"
-        android:layout_gravity="center_vertical"/>
+        android:layout_width="fill_parent"
+        android:orientation="horizontal">
+
+        <TableLayout
+            android:layout_height="wrap_content"
+            android:layout_width="0dip"
+            android:layout_weight="1"
+            android:layout_marginLeft="16dip">
+
+            <TableRow>
+
+                <TextView
+                    android:id="@+id/label_name"
+                    android:text="Name"
+                    android:layout_gravity="center_vertical"
+                    android:layout_height="wrap_content"
+                    android:layout_width="wrap_content"
+                    android:paddingRight="5dip"/>
+
+                <EditText
+                    android:id="@+id/name"
+                    android:layout_weight="1"
+                    android:layout_height="wrap_content"
+                    android:layout_width="fill_parent"/>
+
+            </TableRow>
+
+            <TableRow>
+
+                <TextView
+                    android:id="@+id/label_email"
+                    android:text="Email"
+                    android:layout_gravity="center_vertical"
+                    android:layout_height="wrap_content"
+                    android:layout_width="wrap_content"
+                    android:paddingRight="5dip"/>
+
+                <EditText
+                    android:id="@+id/email"
+                    android:layout_weight="1"
+                    android:layout_height="wrap_content"
+                    android:layout_width="fill_parent"/>
+
+            </TableRow>
+
+            <TableRow>
+
+                <TextView
+                    android:id="@+id/label_comment"
+                    android:text="Comment"
+                    android:layout_gravity="center_vertical"
+                    android:layout_height="wrap_content"
+                    android:layout_width="wrap_content"
+                    android:paddingRight="5dip"/>
+
+                <EditText
+                    android:id="@+id/comment"
+                    android:layout_weight="1"
+                    android:layout_height="wrap_content"
+                    android:layout_width="fill_parent"/>
+
+            </TableRow>
+
+        </TableLayout>
+
+        <ImageButton
+            android:id="@+id/delete"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            style="@style/MinusButton"
+            android:layout_gravity="center_vertical"/>
+
+    </LinearLayout>
 
-</LinearLayout>
 </org.thialfihar.android.apg.ui.widget.UserIdEditor>
diff --git a/res/layout/encrypt.xml b/res/layout/encrypt.xml
new file mode 100644
index 000000000..dd51318c2
--- /dev/null
+++ b/res/layout/encrypt.xml
@@ -0,0 +1,382 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 Thialfihar <thi@thialfihar.org>
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:orientation="vertical"
+    android:paddingTop="5dip">
+
+    <ScrollView
+        android:layout_width="fill_parent"
+        android:layout_height="0dip"
+        android:layout_weight="1"
+        android:fillViewport="true">
+
+        <LinearLayout
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"
+            android:orientation="vertical"
+            android:layout_marginLeft="5dip">
+
+            <LinearLayout
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">
+
+                <ImageView
+                    android:id="@+id/sourcePrevious"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_previous"/>
+
+                <TextView
+                    android:id="@+id/sourceLabel"
+                    android:layout_width="0dip"
+                    android:layout_height="fill_parent"
+                    android:layout_weight="1"
+                    android:text="@string/label_message"
+                    android:textAppearance="?android:attr/textAppearanceMedium"
+                    android:gravity="center_horizontal|center_vertical"
+                    android:textColor="#ffffffff"/>
+
+                <ImageView
+                    android:id="@+id/sourceNext"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_next"/>
+
+            </LinearLayout>
+
+            <ViewFlipper
+                android:id="@+id/source"
+                android:layout_width="fill_parent"
+                android:layout_height="0dip"
+                android:layout_weight="1">
+
+                <LinearLayout
+                    android:id="@+id/sourceMessage"
+                    android:layout_width="fill_parent"
+                    android:layout_height="fill_parent"
+                    android:orientation="vertical">
+
+                    <EditText
+                        android:id="@+id/message"
+                        android:layout_width="fill_parent"
+                        android:layout_height="fill_parent"
+                        android:gravity="top"
+                        android:inputType="text|textCapSentences|textMultiLine|textLongMessage"/>
+
+                </LinearLayout>
+
+                <LinearLayout
+                    android:id="@+id/sourceFile"
+                    android:layout_width="fill_parent"
+                    android:layout_height="fill_parent"
+                    android:orientation="vertical">
+
+                    <LinearLayout
+                        android:layout_width="fill_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="horizontal">
+
+                        <EditText
+                            android:id="@+id/filename"
+                            android:layout_width="0dip"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"/>
+
+                        <ImageButton
+                            android:id="@+id/btn_browse"
+                            android:src="@drawable/ic_launcher_folder_small"
+                            android:layout_height="wrap_content"
+                            android:layout_width="wrap_content"/>
+
+                    </LinearLayout>
+
+                    <LinearLayout
+                         android:layout_width="fill_parent"
+                         android:layout_height="wrap_content"
+                         android:orientation="horizontal">
+
+                         <TextView
+                             android:id="@+id/label_fileCompression"
+                             android:text="@string/label_fileCompression"
+                             android:textAppearance="?android:attr/textAppearanceMedium"
+                             android:layout_height="wrap_content"
+                             android:layout_width="0dip"
+                             android:layout_weight="1"
+                             android:layout_gravity="center_vertical"
+                             android:paddingRight="10dip"/>
+
+                         <Spinner
+                             android:id="@+id/fileCompression"
+                             android:layout_width="wrap_content"
+                             android:layout_height="wrap_content"
+                             android:layout_gravity="center_vertical"/>
+
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:layout_width="fill_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="horizontal">
+
+                        <TextView
+                            android:id="@+id/label_deleteAfterEncryption"
+                            android:text="@string/label_deleteAfterEncryption"
+                            android:textAppearance="?android:attr/textAppearanceMedium"
+                            android:layout_gravity="center_vertical"
+                            android:paddingRight="10dip"
+                            android:layout_height="wrap_content"
+                            android:layout_width="0dip"
+                            android:layout_weight="1"/>
+
+                        <CheckBox
+                            android:id="@+id/deleteAfterEncryption"
+                            android:layout_height="wrap_content"
+                            android:layout_width="wrap_content"
+                            android:layout_gravity="center_vertical"/>
+
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:layout_width="fill_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="horizontal">
+
+                        <TextView
+                            android:id="@+id/label_asciiArmour"
+                            android:text="@string/label_asciiArmour"
+                            android:textAppearance="?android:attr/textAppearanceMedium"
+                            android:layout_gravity="center_vertical"
+                            android:paddingRight="10dip"
+                            android:layout_height="wrap_content"
+                            android:layout_width="0dip"
+                            android:layout_weight="1"/>
+
+                        <CheckBox
+                            android:id="@+id/asciiArmour"
+                            android:layout_height="wrap_content"
+                            android:layout_width="wrap_content"
+                            android:layout_gravity="center_vertical"/>
+
+                    </LinearLayout>
+
+                </LinearLayout>
+
+            </ViewFlipper>
+
+            <View
+                android:layout_width="fill_parent"
+                android:layout_height="1dip"
+                android:background="?android:attr/listDivider"
+                android:layout_marginBottom="5dip"/>
+
+            <LinearLayout
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">
+
+                <ImageView
+                    android:id="@+id/modePrevious"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_previous"/>
+
+                <TextView
+                    android:id="@+id/modeLabel"
+                    android:layout_width="0dip"
+                    android:layout_height="fill_parent"
+                    android:layout_weight="1"
+                    android:text="@string/label_asymmetric"
+                    android:textAppearance="?android:attr/textAppearanceMedium"
+                    android:gravity="center_horizontal|center_vertical"
+                    android:textColor="#ffffffff"/>
+
+                <ImageView
+                    android:id="@+id/modeNext"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_next"/>
+
+            </LinearLayout>
+
+            <ViewFlipper
+                android:id="@+id/mode"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content">
+
+                <LinearLayout
+                    android:id="@+id/modeAsymmetric"
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical">
+
+                    <LinearLayout
+                        android:layout_width="fill_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="horizontal">
+
+                        <TextView
+                            android:id="@+id/label_sign"
+                            android:text="@string/label_sign"
+                            android:textAppearance="?android:attr/textAppearanceMedium"
+                            android:layout_width="0dip"
+                            android:layout_weight="1"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center_vertical"/>
+
+                        <LinearLayout
+                            android:orientation="vertical"
+                            android:layout_height="wrap_content"
+                            android:layout_width="wrap_content"
+                            android:layout_gravity="center_vertical"
+                            android:paddingRight="5dip">
+
+                            <TextView
+                                android:id="@+id/mainUserId"
+                                android:text="Main User Id"
+                                android:textAppearance="?android:attr/textAppearanceMedium"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="right"/>
+
+                            <TextView
+                                android:id="@+id/mainUserIdRest"
+                                android:text="Main User Id Rest"
+                                android:textAppearance="?android:attr/textAppearanceSmall"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="right"/>
+
+                        </LinearLayout>
+
+                        <CheckBox
+                            android:id="@+id/sign"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center_vertical"/>
+
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:layout_width="fill_parent"
+                        android:layout_height="wrap_content"
+                        android:paddingBottom="3dip"
+                        android:orientation="horizontal">
+
+                        <TextView
+                            android:id="@+id/label_selectPublicKeys"
+                            android:text="@string/label_selectPublicKeys"
+                            android:textAppearance="?android:attr/textAppearanceMedium"
+                            android:layout_height="wrap_content"
+                            android:layout_width="0dip"
+                            android:layout_weight="1"
+                            android:layout_gravity="center_vertical"/>
+
+                        <Button
+                            android:text="@string/btn_selectEncryptKeys"
+                            android:id="@+id/btn_selectEncryptKeys"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center_vertical"/>
+
+                    </LinearLayout>
+                </LinearLayout>
+
+                <TableLayout
+                    android:id="@+id/modeSymmetric"
+                    android:layout_height="wrap_content"
+                    android:layout_width="fill_parent"
+                    android:stretchColumns="1">
+
+                    <TableRow>
+
+                        <TextView
+                            android:id="@+id/label_passPhrase"
+                            android:text="@string/label_passPhrase"
+                            android:textAppearance="?android:attr/textAppearanceMedium"
+                            android:layout_height="wrap_content"
+                            android:layout_width="wrap_content"
+                            android:layout_gravity="center_vertical"
+                            android:paddingRight="10dip"/>
+
+                        <EditText
+                            android:id="@+id/passPhrase"
+                            android:layout_height="wrap_content"
+                            android:layout_width="fill_parent"
+                            android:inputType="textPassword"/>
+
+                    </TableRow>
+
+                    <TableRow>
+
+                        <TextView
+                            android:id="@+id/label_passPhraseAgain"
+                            android:text="@string/label_passPhraseAgain"
+                            android:textAppearance="?android:attr/textAppearanceMedium"
+                            android:layout_height="wrap_content"
+                            android:layout_width="wrap_content"
+                            android:layout_gravity="center_vertical"
+                            android:paddingRight="10dip"/>
+
+                        <EditText
+                            android:id="@+id/passPhraseAgain"
+                            android:layout_height="wrap_content"
+                            android:layout_width="fill_parent"
+                            android:inputType="textPassword"/>
+
+                    </TableRow>
+
+                </TableLayout>
+
+            </ViewFlipper>
+
+            <View
+                android:layout_width="fill_parent"
+                android:layout_height="1dip"
+                android:background="?android:attr/listDivider"
+                android:layout_marginBottom="5dip"/>
+
+        </LinearLayout>
+
+    </ScrollView>
+
+    <LinearLayout
+        android:orientation="horizontal"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        style="@android:style/ButtonBar">
+
+        <Button
+            android:id="@+id/btn_encryptToClipboard"
+            android:text="@string/btn_encryptToClipboard"
+            android:layout_weight="1"
+            android:layout_width="0dip"
+            android:layout_height="wrap_content"/>
+
+        <Button
+            android:id="@+id/btn_encrypt"
+            android:text="@string/btn_encrypt"
+            android:layout_weight="1"
+            android:layout_width="0dip"
+            android:layout_height="wrap_content"/>
+
+    </LinearLayout>
+
+</LinearLayout>
diff --git a/res/layout/encrypt_message.xml b/res/layout/encrypt_message.xml
deleted file mode 100644
index 254552e03..000000000
--- a/res/layout/encrypt_message.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 Thialfihar <thi@thialfihar.org>
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:fillViewport="true">
-
-<EditText
-    android:id="@+id/message"
-    android:layout_width="fill_parent"
-    android:layout_height="0dip"
-    android:layout_weight="1"
-    android:gravity="top"
-    android:inputType="text|textCapSentences|textMultiLine|textLongMessage">
-</EditText>
-
-<LinearLayout
-    android:layout_height="wrap_content"
-    android:layout_width="fill_parent" android:paddingBottom="3dip">
-
-<CheckBox
-    android:text="@string/sign"
-    android:id="@+id/sign"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:layout_gravity="center_vertical"/>
-
-<LinearLayout
-    android:orientation="vertical"
-    android:layout_height="wrap_content"
-    android:layout_width="fill_parent"
-    android:layout_gravity="center_vertical"
-    android:paddingRight="5dip">
-
-<TextView
-    android:id="@+id/main_user_id"
-    android:text="Main User Id"
-    android:textAppearance="?android:attr/textAppearanceMedium"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:layout_gravity="right">
-</TextView>
-
-<TextView
-    android:id="@+id/main_user_id_rest"
-    android:text="Main User Id Rest"
-    android:textAppearance="?android:attr/textAppearanceSmall"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content" android:layout_gravity="right">
-</TextView>
-
-</LinearLayout>
-</LinearLayout>
-
-<LinearLayout
-   android:orientation="horizontal"
-   android:layout_width="fill_parent"
-   android:layout_height="wrap_content"
-   style="@android:style/ButtonBar">
-
-<Button
-    android:text="@string/btn_selectEncryptKeys"
-    android:id="@+id/btn_selectEncryptKeys"
-    android:layout_weight="1"
-    android:layout_width="0dip"
-    android:layout_height="wrap_content"/>
-
-<Button
-    android:id="@+id/btn_send"
-    android:text="@string/btn_send"
-    android:layout_weight="1"
-    android:layout_width="0dip"
-    android:layout_height="wrap_content"/>
-
-</LinearLayout>
-
-</LinearLayout>
-
-
diff --git a/res/layout/file_dialog.xml b/res/layout/file_dialog.xml
new file mode 100644
index 000000000..c42d2636e
--- /dev/null
+++ b/res/layout/file_dialog.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 Thialfihar <thi@thialfihar.org>
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal"
+    android:paddingLeft="5dip"
+    android:paddingRight="5dip">
+
+    <EditText
+        android:id="@+id/input"
+        android:layout_width="0dip"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"/>
+
+    <ImageButton
+        android:id="@+id/btn_browse"
+        android:src="@drawable/ic_launcher_folder_small"
+        android:layout_height="wrap_content"
+        android:layout_width="wrap_content"/>
+
+</LinearLayout>
diff --git a/res/layout/info.xml b/res/layout/info.xml
new file mode 100644
index 000000000..ab9e99a5b
--- /dev/null
+++ b/res/layout/info.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:fillViewport="true"
+    android:padding="5dip">
+
+    <TextView
+        android:id="@+id/message"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:textColor="#ffffffff"
+        android:autoLink="all"/>
+</ScrollView>
diff --git a/res/layout/key_list.xml b/res/layout/key_list.xml
new file mode 100644
index 000000000..f08495368
--- /dev/null
+++ b/res/layout/key_list.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 Thialfihar <thi@thialfihar.org>
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<ScrollView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:fillViewport="true">
+
+    <ExpandableListView
+        android:id="@+id/list"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"/>
+
+</ScrollView>
diff --git a/res/layout/key_list_child_item_master_key.xml b/res/layout/key_list_child_item_master_key.xml
index 47eba65b5..790fd42f4 100644
--- a/res/layout/key_list_child_item_master_key.xml
+++ b/res/layout/key_list_child_item_master_key.xml
@@ -19,54 +19,62 @@
     android:singleLine="true"

     android:paddingLeft="10dip"

     android:layout_marginRight="?android:attr/scrollbarSize"

-    android:layout_height="?android:attr/listPreferredItemHeight" android:layout_width="fill_parent">

+    android:layout_height="?android:attr/listPreferredItemHeight"

+    android:layout_width="fill_parent">

 

-<LinearLayout

-    android:layout_height="wrap_content"

-    android:layout_width="fill_parent"

-    android:orientation="horizontal"

-    android:paddingRight="3dip">

+    <LinearLayout

+        android:layout_height="wrap_content"

+        android:layout_width="fill_parent"

+        android:orientation="horizontal"

+        android:paddingRight="3dip">

 

-<ImageView

-    android:id="@+id/ic_master_key"

-    android:src="@drawable/key_small"

-    android:paddingRight="6dip"

-    android:layout_width="wrap_content"

-    android:layout_height="wrap_content" android:layout_gravity="center_vertical"/>

+        <ImageView

+            android:id="@+id/ic_masterKey"

+            android:src="@drawable/key_small"

+            android:paddingRight="6dip"

+            android:layout_width="wrap_content"

+            android:layout_height="wrap_content"

+            android:layout_gravity="center_vertical"/>

 

-<TextView

-    android:id="@+id/key_id"

-    android:text="Key ID"

-    android:textAppearance="?android:attr/textAppearanceMedium"

-    android:layout_width="wrap_content"

-    android:layout_height="wrap_content" android:paddingRight="5dip" android:typeface="monospace"/>

+        <TextView

+            android:id="@+id/keyId"

+            android:text="Key ID"

+            android:textAppearance="?android:attr/textAppearanceMedium"

+            android:layout_width="wrap_content"

+            android:layout_height="wrap_content"

+            android:paddingRight="5dip"

+            android:typeface="monospace"/>

 

-<TextView

-    android:id="@+id/key_details"

-    android:text="(RSA, 1024bit)"

-    android:textAppearance="?android:attr/textAppearanceSmall"

-    android:layout_width="wrap_content"

-    android:layout_height="wrap_content"/>

+        <TextView

+            android:id="@+id/keyDetails"

+            android:text="(RSA, 1024bit)"

+            android:textAppearance="?android:attr/textAppearanceSmall"

+            android:layout_width="wrap_content"

+            android:layout_height="wrap_content"/>

 

+        <LinearLayout

+            android:gravity="right"

+            android:orientation="horizontal"

+            android:paddingBottom="2dip"

+            android:paddingTop="2dip"

+            android:layout_width="fill_parent"

+            android:layout_height="fill_parent"

+            android:layout_gravity="center_vertical">

 

-<LinearLayout

-    android:gravity="right"

-    android:orientation="horizontal"

-    android:layout_width="fill_parent" android:paddingBottom="2dip" android:paddingTop="2dip" android:layout_height="fill_parent" android:layout_gravity="center_vertical">

+            <ImageView

+                android:id="@+id/ic_encryptKey"

+                android:src="@drawable/encrypted_small"

+                android:layout_width="wrap_content"

+                android:layout_height="wrap_content"/>

 

-<ImageView

-    android:id="@+id/ic_encrypt_key"

-    android:src="@drawable/encrypted_small"

-    android:layout_width="wrap_content"

-    android:layout_height="wrap_content"/>

+            <ImageView

+                android:id="@+id/ic_signKey"

+                android:src="@drawable/signed_small"

+                android:layout_width="wrap_content"

+                android:layout_height="wrap_content"/>

 

-<ImageView

-    android:id="@+id/ic_sign_key"

-    android:src="@drawable/signed_small"

-    android:layout_width="wrap_content"

-    android:layout_height="wrap_content"/>

+        </LinearLayout>

 

-</LinearLayout>

+    </LinearLayout>

 

 </LinearLayout>

-</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/key_list_child_item_sub_key.xml b/res/layout/key_list_child_item_sub_key.xml
index 085d78f05..ac7c217a6 100644
--- a/res/layout/key_list_child_item_sub_key.xml
+++ b/res/layout/key_list_child_item_sub_key.xml
@@ -22,49 +22,51 @@
     android:layout_height="?android:attr/listPreferredItemHeight"
     android:layout_width="fill_parent">
 
-<LinearLayout
-    android:layout_height="wrap_content"
-    android:layout_width="fill_parent"
-    android:orientation="horizontal"
-    android:paddingRight="3dip">
+    <LinearLayout
+        android:layout_height="wrap_content"
+        android:layout_width="fill_parent"
+        android:orientation="horizontal"
+        android:paddingRight="3dip">
 
-<TextView
-    android:id="@+id/key_id"
-    android:text="Key ID"
-    android:textAppearance="?android:attr/textAppearanceMedium"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content" android:paddingRight="5dip" android:typeface="monospace"/>
+        <TextView
+            android:id="@+id/keyId"
+            android:text="Key ID"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:paddingRight="5dip"
+            android:typeface="monospace"/>
 
-<TextView
-    android:id="@+id/key_details"
-    android:text="(RSA, 1024bit)"
-    android:textAppearance="?android:attr/textAppearanceSmall"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"/>
+        <TextView
+            android:id="@+id/keyDetails"
+            android:text="(RSA, 1024bit)"
+            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"/>
 
+        <LinearLayout
+            android:gravity="right"
+            android:orientation="horizontal"
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"
+            android:paddingBottom="2dip"
+            android:paddingTop="2dip"
+            android:layout_gravity="center_vertical">
 
-<LinearLayout
-    android:gravity="right"
-    android:orientation="horizontal"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:paddingBottom="2dip"
-    android:paddingTop="2dip"
-     android:layout_gravity="center_vertical">
+            <ImageView
+                android:id="@+id/ic_encryptKey"
+                android:src="@drawable/encrypted_small"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"/>
 
-<ImageView
-    android:id="@+id/ic_encrypt_key"
-    android:src="@drawable/encrypted_small"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"/>
+            <ImageView
+                android:id="@+id/ic_signKey"
+                android:src="@drawable/signed_small"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"/>
 
-<ImageView
-    android:id="@+id/ic_sign_key"
-    android:src="@drawable/signed_small"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"/>
+        </LinearLayout>
 
-</LinearLayout>
+    </LinearLayout>
 
 </LinearLayout>
-</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/key_list_child_item_user_id.xml b/res/layout/key_list_child_item_user_id.xml
index 80cdd2867..3226dd58a 100644
--- a/res/layout/key_list_child_item_user_id.xml
+++ b/res/layout/key_list_child_item_user_id.xml
@@ -22,12 +22,12 @@
     android:layout_width="fill_parent"

     android:layout_height="?android:attr/listPreferredItemHeight">

 

-<TextView

-    android:id="@+id/user_id"

-    android:text="User ID"

-    android:textAppearance="?android:attr/textAppearanceSmall"

-    android:layout_width="wrap_content"

-    android:layout_height="wrap_content"

-    android:paddingRight="3dip"/>

+    <TextView

+        android:id="@+id/userId"

+        android:text="User ID"

+        android:textAppearance="?android:attr/textAppearanceSmall"

+        android:layout_width="wrap_content"

+        android:layout_height="wrap_content"

+        android:paddingRight="3dip"/>

 

 </LinearLayout>

diff --git a/res/layout/key_list_group_item.xml b/res/layout/key_list_group_item.xml
index aaada82e3..35d0ab367 100644
--- a/res/layout/key_list_group_item.xml
+++ b/res/layout/key_list_group_item.xml
@@ -21,32 +21,33 @@
     android:layout_width="fill_parent"
     android:layout_height="?android:attr/listPreferredItemHeight">
 
-<LinearLayout
-    android:orientation="vertical"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content" android:paddingLeft="36dip">
-
-<TextView
-    android:id="@+id/main_user_id"
-    android:text="Main User ID"
-    android:textAppearance="?android:attr/textAppearanceMedium"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"/>
-
-<TextView
-    android:id="@+id/main_user_id_rest"
-    android:text="&lt;user@somewhere.com&gt;"
-    android:textAppearance="?android:attr/textAppearanceSmall"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"/>
-
-</LinearLayout>
-
-<LinearLayout
-    android:orientation="vertical"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content">
+    <LinearLayout
+        android:orientation="vertical"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:paddingLeft="36dip">
+
+        <TextView
+            android:id="@+id/mainUserId"
+            android:text="Main User ID"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"/>
+
+        <TextView
+            android:id="@+id/mainUserIdRest"
+            android:text="&lt;user@somewhere.com&gt;"
+            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"/>
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:orientation="vertical"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content">
+
+    </LinearLayout>
 
 </LinearLayout>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/mailbox_message_item.xml b/res/layout/mailbox_message_item.xml
index b2b5e91d4..05a267fb6 100644
--- a/res/layout/mailbox_message_item.xml
+++ b/res/layout/mailbox_message_item.xml
@@ -24,34 +24,34 @@
     android:layout_height="?android:attr/listPreferredItemHeight"
     android:layout_width="fill_parent">
 
-<ImageView
-    android:id="@+id/ic_encrypted"
-    android:src="@drawable/encrypted"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:layout_centerVertical="true"/>
-
-<LinearLayout
-    android:orientation="vertical"
-    android:paddingLeft="5dip"
-    android:layout_weight="1"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content">
-
-<TextView
-    android:id="@+id/subject"
-    android:text="Subject"
-    android:textAppearance="?android:attr/textAppearanceMedium"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"/>
-
-<TextView
-    android:id="@+id/email_address"
-    android:text="user@somewhere.com"
-    android:textAppearance="?android:attr/textAppearanceSmall"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"/>
+    <ImageView
+        android:id="@+id/ic_status"
+        android:src="@drawable/encrypted"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"/>
+
+    <LinearLayout
+        android:orientation="vertical"
+        android:paddingLeft="5dip"
+        android:layout_weight="1"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content">
+
+        <TextView
+            android:id="@+id/subject"
+            android:text="Subject"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"/>
+
+        <TextView
+            android:id="@+id/emailAddress"
+            android:text="user@somewhere.com"
+            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"/>
+
+    </LinearLayout>
 
 </LinearLayout>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/main.xml b/res/layout/main.xml
index 81c5f224b..f88c393db 100644
--- a/res/layout/main.xml
+++ b/res/layout/main.xml
@@ -22,40 +22,68 @@
     android:paddingTop="5dip"
     android:fillViewport="true">
 
-<ScrollView
-   android:layout_marginTop="10dip"
-   android:layout_width="fill_parent"
-   android:layout_height="0dip"
-   android:layout_weight="1">
+    <ScrollView
+        android:layout_marginTop="10dip"
+        android:layout_width="fill_parent"
+        android:layout_height="0dip"
+        android:layout_weight="1"
+        android:fillViewport="true">
 
-<ListView
-   android:id="@+id/account_list"
-   android:layout_width="fill_parent"
-   android:layout_height="wrap_content">
-</ListView>
+        <ListView
+            android:id="@+id/accounts"
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"/>
 
-</ScrollView>
+    </ScrollView>
 
-<LinearLayout
-   android:orientation="horizontal"
-   android:layout_width="fill_parent"
-   android:layout_height="wrap_content"
-   style="@android:style/ButtonBar">
-
-<Button
-   android:id="@+id/btn_encryptMessage"
-   android:text="@string/btn_encryptMessage"
-   android:layout_width="wrap_content"
-   android:layout_weight="1"
-   android:layout_height="wrap_content"/>
-
-<Button
-   android:id="@+id/btn_decryptMessage"
-   android:text="@string/btn_decryptMessage"
-   android:layout_width="wrap_content"
-   android:layout_weight="1"
-   android:layout_height="wrap_content"/>
+    <LinearLayout
+        android:orientation="vertical"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        style="@android:style/ButtonBar">
 
-</LinearLayout>
+        <LinearLayout
+            android:orientation="horizontal"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content">
+
+            <Button
+                android:id="@+id/btn_encryptFile"
+                android:text="@string/btn_encryptFile"
+                android:layout_width="wrap_content"
+                android:layout_weight="1"
+                android:layout_height="wrap_content"/>
+
+            <Button
+                android:id="@+id/btn_decryptFile"
+                android:text="@string/btn_decryptFile"
+                android:layout_width="wrap_content"
+                android:layout_weight="1"
+                android:layout_height="wrap_content"/>
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:orientation="horizontal"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content">
 
-</LinearLayout>
\ No newline at end of file
+            <Button
+                android:id="@+id/btn_encryptMessage"
+                android:text="@string/btn_encryptMessage"
+                android:layout_width="wrap_content"
+                android:layout_weight="1"
+                android:layout_height="wrap_content"/>
+
+            <Button
+                android:id="@+id/btn_decryptMessage"
+                android:text="@string/btn_decryptMessage"
+                android:layout_width="wrap_content"
+                android:layout_weight="1"
+                android:layout_height="wrap_content"/>
+
+        </LinearLayout>
+
+    </LinearLayout>
+
+</LinearLayout>
diff --git a/res/layout/pass_phrase.xml b/res/layout/pass_phrase.xml
new file mode 100644
index 000000000..f377e5bf7
--- /dev/null
+++ b/res/layout/pass_phrase.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  android:layout_width="fill_parent"
+  android:layout_height="wrap_content"
+  android:orientation="vertical"
+  android:paddingLeft="5dip"
+  android:paddingRight="5dip">
+
+    <EditText
+        android:id="@+id/passPhrase"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:inputType="textPassword"/>
+
+    <EditText
+        android:id="@+id/passPhraseAgain"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:inputType="textPassword"/>
+
+</LinearLayout>
diff --git a/res/layout/preferences.xml b/res/layout/preferences.xml
new file mode 100644
index 000000000..1ff97a0e4
--- /dev/null
+++ b/res/layout/preferences.xml
@@ -0,0 +1,197 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 Thialfihar <thi@thialfihar.org>
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<ScrollView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:fillViewport="true">
+
+    <LinearLayout
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:orientation="vertical"
+        android:paddingTop="5dip"
+        android:layout_marginRight="?android:attr/scrollbarSize">
+
+        <TextView
+            android:id="@+id/section_general"
+            android:text="@string/section_general"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:textAppearance="?android:attr/textAppearanceLarge"/>
+
+        <View
+            android:layout_width="fill_parent"
+            android:layout_height="1dip"
+            android:background="?android:attr/listDivider"
+            android:layout_marginBottom="5dip"/>
+
+        <LinearLayout
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
+
+            <TextView
+                android:id="@+id/label_passPhraseCacheTtl"
+                android:text="@string/label_passPhraseCacheTtl"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:layout_height="wrap_content"
+                android:layout_width="0dip"
+                android:layout_weight="1"
+                android:layout_gravity="center_vertical"
+                android:paddingRight="10dip"/>
+
+            <Spinner
+                android:id="@+id/passPhraseCacheTtl"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"/>
+
+        </LinearLayout>
+
+        <TextView
+            android:id="@+id/section_defaults"
+            android:text="@string/section_defaults"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="5dip"
+            android:textAppearance="?android:attr/textAppearanceLarge"/>
+
+        <View
+            android:layout_width="fill_parent"
+            android:layout_height="1dip"
+            android:background="?android:attr/listDivider"
+            android:layout_marginBottom="5dip"/>
+
+        <LinearLayout
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
+
+            <TextView
+                android:id="@+id/label_encryptionAlgorithm"
+                android:text="@string/label_encryptionAlgorithm"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:layout_height="wrap_content"
+                android:layout_width="0dip"
+                android:layout_weight="1"
+                android:layout_gravity="center_vertical"
+                android:paddingRight="10dip"/>
+
+            <Spinner
+                android:id="@+id/encryptionAlgorithm"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"/>
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
+
+            <TextView
+                android:id="@+id/label_hashAlgorithm"
+                android:text="@string/label_hashAlgorithm"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:layout_height="wrap_content"
+                android:layout_width="0dip"
+                android:layout_weight="1"
+                android:layout_gravity="center_vertical"
+                android:paddingRight="10dip"/>
+
+            <Spinner
+                android:id="@+id/hashAlgorithm"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"/>
+
+       </LinearLayout>
+
+       <LinearLayout
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
+
+            <TextView
+                android:id="@+id/label_messageCompression"
+                android:text="@string/label_messageCompression"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:layout_height="wrap_content"
+                android:layout_width="0dip"
+                android:layout_weight="1"
+                android:layout_gravity="center_vertical"
+                android:paddingRight="10dip"/>
+
+            <Spinner
+                android:id="@+id/messageCompression"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"/>
+
+       </LinearLayout>
+
+       <LinearLayout
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
+
+            <TextView
+                android:id="@+id/label_fileCompression"
+                android:text="@string/label_fileCompression"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:layout_height="wrap_content"
+                android:layout_width="0dip"
+                android:layout_weight="1"
+                android:layout_gravity="center_vertical"
+                android:paddingRight="10dip"/>
+
+            <Spinner
+                android:id="@+id/fileCompression"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"/>
+
+       </LinearLayout>
+
+       <LinearLayout
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
+
+            <TextView
+                android:id="@+id/label_asciiArmour"
+                android:text="@string/label_asciiArmour"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:layout_gravity="center_vertical"
+                android:paddingRight="10dip"
+                android:layout_height="wrap_content"
+                android:layout_width="0dip"
+                android:layout_weight="1"/>
+
+            <CheckBox
+                android:id="@+id/asciiArmour"
+                android:layout_height="wrap_content"
+                android:layout_width="wrap_content"
+                android:layout_gravity="center_vertical"/>
+
+        </LinearLayout>
+
+    </LinearLayout>
+
+</ScrollView>
diff --git a/res/layout/select_public_key.xml b/res/layout/select_public_key.xml
index 9a2d9f578..3c7c6534a 100644
--- a/res/layout/select_public_key.xml
+++ b/res/layout/select_public_key.xml
@@ -21,34 +21,33 @@
     android:layout_height="fill_parent"
     android:fillViewport="true">
 
-<ListView
-    android:id="@+id/list"
-    android:choiceMode="multipleChoice"
-    android:layout_width="fill_parent"
-    android:layout_height="0dip"
-    android:layout_weight="1">
-</ListView>
-
-<LinearLayout
-   android:orientation="horizontal"
-   android:layout_width="fill_parent"
-   android:layout_height="wrap_content"
-   style="@android:style/ButtonBar">
-
-<Button
-    android:text="@android:string/ok"
-    android:id="@+id/btn_ok"
-    android:layout_width="0dip"
-    android:layout_height="wrap_content"
-    android:layout_weight="1"/>
-
-<Button
-    android:text="@android:string/cancel"
-    android:id="@+id/btn_cancel"
-    android:layout_width="0dip"
-    android:layout_height="wrap_content"
-    android:layout_weight="1"/>
-
-</LinearLayout>
+    <ListView
+        android:id="@+id/list"
+        android:choiceMode="multipleChoice"
+        android:layout_width="fill_parent"
+        android:layout_height="0dip"
+        android:layout_weight="1"/>
+
+    <LinearLayout
+        android:orientation="horizontal"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        style="@android:style/ButtonBar">
+
+        <Button
+            android:text="@android:string/ok"
+            android:id="@+id/btn_ok"
+            android:layout_width="0dip"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"/>
+
+        <Button
+            android:text="@android:string/cancel"
+            android:id="@+id/btn_cancel"
+            android:layout_width="0dip"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"/>
+
+    </LinearLayout>
 
 </LinearLayout>
diff --git a/res/layout/select_public_key_item.xml b/res/layout/select_public_key_item.xml
index aba0c09b9..bb0dd30a4 100644
--- a/res/layout/select_public_key_item.xml
+++ b/res/layout/select_public_key_item.xml
@@ -22,75 +22,75 @@
     android:layout_height="?android:attr/listPreferredItemHeight"
     android:layout_width="fill_parent">
 
-<CheckBox
-    android:id="@+id/selected"
-    android:focusable="false"
-    android:focusableInTouchMode="false"
-    android:clickable="false"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"/>
+    <CheckBox
+        android:id="@+id/selected"
+        android:focusable="false"
+        android:focusableInTouchMode="false"
+        android:clickable="false"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"/>
 
-<LinearLayout
-    android:orientation="vertical"
-    android:paddingLeft="5dip"
-    android:layout_width="0dip"
-    android:layout_height="wrap_content"
-    android:layout_weight="1">
-
-<TextView
-    android:id="@+id/main_user_id"
-    android:text="Main User ID"
-    android:textAppearance="?android:attr/textAppearanceLarge"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"/>
-
-<TextView
-    android:id="@+id/main_user_id_rest"
-    android:text="&lt;user@somewhere.com&gt;"
-    android:textAppearance="?android:attr/textAppearanceSmall"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"/>
-</LinearLayout>
+    <LinearLayout
+        android:orientation="vertical"
+        android:paddingLeft="5dip"
+        android:layout_width="0dip"
+        android:layout_height="wrap_content"
+        android:layout_weight="1">
 
-<LinearLayout
-    android:id="@+id/right_column"
-    android:orientation="vertical"
-    android:minWidth="90dip"
-    android:paddingLeft="3dip"
-    android:gravity="right"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content">
-
-<TextView
-    android:id="@+id/key_id"
-    android:text="BBBBBBBB"
-    android:textAppearance="?android:attr/textAppearanceMedium"
-    android:typeface="monospace"
-    android:layout_width="wrap_content"
-    android:layout_height="fill_parent"/>
-
-<TextView
-    android:id="@+id/creation"
-    android:textAppearance="?android:attr/textAppearanceSmall"
-    android:text="31.12.2009"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"/>
-
-<TextView
-    android:id="@+id/expiry"
-    android:textAppearance="?android:attr/textAppearanceSmall"
-    android:text="31.12.2010"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"/>
-
-<TextView
-    android:id="@+id/status"
-    android:textAppearance="?android:attr/textAppearanceSmall"
-    android:text="expired"
-    android:textStyle="italic"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"/>
+        <TextView
+            android:id="@+id/mainUserId"
+            android:text="Main User ID"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"/>
 
-</LinearLayout>
+        <TextView
+            android:id="@+id/mainUserIdRest"
+            android:text="&lt;user@somewhere.com&gt;"
+            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"/>
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:orientation="vertical"
+        android:minWidth="90dip"
+        android:paddingLeft="3dip"
+        android:gravity="right"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content">
 
-</LinearLayout>
\ No newline at end of file
+        <TextView
+            android:id="@+id/keyId"
+            android:text="BBBBBBBB"
+            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:typeface="monospace"
+            android:layout_width="wrap_content"
+            android:layout_height="fill_parent"/>
+
+        <TextView
+            android:id="@+id/creation"
+            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:text="31.12.2009"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"/>
+
+        <TextView
+            android:id="@+id/expiry"
+            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:text="31.12.2010"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"/>
+
+        <TextView
+            android:id="@+id/status"
+            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:text="expired"
+            android:textStyle="italic"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"/>
+
+    </LinearLayout>
+
+</LinearLayout>
diff --git a/res/layout/select_secret_key.xml b/res/layout/select_secret_key.xml
index 64967ace6..f252f56e5 100644
--- a/res/layout/select_secret_key.xml
+++ b/res/layout/select_secret_key.xml
@@ -21,10 +21,9 @@
     android:layout_height="fill_parent"
     android:fillViewport="true">
 
-<ListView
-    android:id="@+id/list"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent">
-</ListView>
+    <ListView
+        android:id="@+id/list"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"/>
 
 </LinearLayout>
diff --git a/res/layout/select_secret_key_item.xml b/res/layout/select_secret_key_item.xml
index 0b0475c37..35bf58e23 100644
--- a/res/layout/select_secret_key_item.xml
+++ b/res/layout/select_secret_key_item.xml
@@ -22,67 +22,68 @@
     android:layout_height="?android:attr/listPreferredItemHeight"
     android:layout_width="fill_parent">
 
-<LinearLayout
-    android:orientation="vertical"
-    android:paddingLeft="5dip"
-    android:paddingRight="5dip"
-    android:layout_width="0dip"
-    android:layout_height="wrap_content"
-    android:layout_weight="1">
+    <LinearLayout
+        android:orientation="vertical"
+        android:paddingLeft="5dip"
+        android:paddingRight="5dip"
+        android:layout_width="0dip"
+        android:layout_height="wrap_content"
+        android:layout_weight="1">
 
-<TextView
-    android:id="@+id/main_user_id"
-    android:text="Main User ID"
-    android:textAppearance="?android:attr/textAppearanceLarge"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"/>
+        <TextView
+            android:id="@+id/mainUserId"
+            android:text="Main User ID"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"/>
 
-<TextView
-    android:id="@+id/main_user_id_rest"
-    android:text="&lt;user@somewhere.com&gt;"
-    android:textAppearance="?android:attr/textAppearanceSmall"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"/>
-</LinearLayout>
+        <TextView
+            android:id="@+id/mainUserIdRest"
+            android:text="&lt;user@somewhere.com&gt;"
+            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"/>
 
-<LinearLayout
-    android:orientation="vertical"
-    android:minWidth="90dip"
-    android:paddingLeft="3dip"
-    android:gravity="right"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content">
+    </LinearLayout>
 
-<TextView
-    android:id="@+id/key_id"
-    android:text="BBBBBBBB"
-    android:textAppearance="?android:attr/textAppearanceMedium"
-    android:typeface="monospace"
-    android:layout_width="wrap_content"
-    android:layout_height="fill_parent"/>
+    <LinearLayout
+        android:orientation="vertical"
+        android:minWidth="90dip"
+        android:paddingLeft="3dip"
+        android:gravity="right"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content">
 
-<TextView
-    android:id="@+id/creation"
-    android:textAppearance="?android:attr/textAppearanceSmall"
-    android:text="31.12.2009"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"/>
+        <TextView
+            android:id="@+id/keyId"
+            android:text="BBBBBBBB"
+            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:typeface="monospace"
+            android:layout_width="wrap_content"
+            android:layout_height="fill_parent"/>
 
-<TextView
-    android:id="@+id/expiry"
-    android:textAppearance="?android:attr/textAppearanceSmall"
-    android:text="31.12.2010"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"/>
+        <TextView
+            android:id="@+id/creation"
+            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:text="31.12.2009"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"/>
 
-<TextView
-    android:id="@+id/status"
-    android:textAppearance="?android:attr/textAppearanceSmall"
-    android:text="expired"
-    android:textStyle="italic"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"/>
+        <TextView
+            android:id="@+id/expiry"
+            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:text="31.12.2010"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"/>
 
-</LinearLayout>
+        <TextView
+            android:id="@+id/status"
+            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:text="expired"
+            android:textStyle="italic"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"/>
+
+    </LinearLayout>
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
new file mode 100644
index 000000000..5bb4dc2ba
--- /dev/null
+++ b/res/values-de/strings.xml
@@ -0,0 +1,230 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 Thialfihar <thi@thialfihar.org>
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<resources>
+    <string name="app_name">APG</string>
+
+    <!-- title_lowerCase: capitalized words, no punctuation -->
+    <string name="title_mailInbox">Mail Inbox</string>
+    <string name="title_managePublicKeys">Manage Public Keys</string>
+    <string name="title_manageSecretKeys">Manage Secret Keys</string>
+    <string name="title_selectRecipients">Select Recipients</string>
+    <string name="title_selectSignature">Select Signature</string>
+    <string name="title_encrypt">Encrypt</string>
+    <string name="title_decrypt">Decrypt</string>
+    <string name="title_authentification">Authentification</string>
+    <string name="title_createKey">Create Key</string>
+    <string name="title_editKey">Edit Key</string>
+    <string name="title_preferences">Preferences</string>
+    <string name="title_changePassPhrase">Change Pass Phrase</string>
+    <string name="title_setPassPhrase">Set Pass Phrase</string>
+    <string name="title_sendEmail">"Send Mail..."</string>
+    <string name="title_encryptToFile">Encrypt To File</string>
+    <string name="title_decryptToFile">Decrypt To File</string>
+    <string name="title_addAccount">Add Account</string>
+    <string name="title_importKeys">Import Keys</string>
+    <string name="title_exportKey">Export Key</string>
+    <string name="title_exportKeys">Export Keys</string>
+
+    <!-- section_lowerCase: capitalized words, no punctuation -->
+    <string name="section_userIds">User IDs</string>
+    <string name="section_keys">Keys</string>
+    <string name="section_defaults">Defaults</string>
+
+    <!-- btn_lowerCase: capitalized words, no punctuation -->
+    <string name="btn_encryptToClipboard">Encrypt To Clipboard</string>
+    <string name="btn_send">Encrypt And Email</string>
+    <string name="btn_encrypt">Encrypt</string>
+    <string name="btn_decrypt">Decrypt</string>
+    <string name="btn_verify">Verify</string>
+    <string name="btn_selectEncryptKeys">Select Recipients</string>
+    <string name="btn_reply">Reply</string>
+    <string name="btn_encryptMessage">Encrypt Message</string>
+    <string name="btn_decryptMessage">Decrypt Message</string>
+    <string name="btn_encryptFile">Encrypt File</string>
+    <string name="btn_decryptFile">Decrypt File</string>
+    <string name="btn_save">Save</string>
+    <string name="btn_doNotSave">Cancel</string>
+    <string name="btn_delete">Delete</string>
+    <string name="btn_noDate">None</string>
+
+    <!-- menu_lowerCase: capitalized words, no punctuation -->
+    <string name="menu_about">About</string>
+    <string name="menu_addAccount">Add GMail Account</string>
+    <string name="menu_deleteAccount">Delete Account</string>
+    <string name="menu_managePublicKeys">Manage Public Keys</string>
+    <string name="menu_manageSecretKeys">Manage Secret Keys</string>
+    <string name="menu_preferences">Settings</string>
+    <string name="menu_changePassPhrase">Change Pass Phrase</string>
+    <string name="menu_setPassPhrase">Set Pass Phrase</string>
+    <string name="menu_importKeys">Import Keys</string>
+    <string name="menu_exportKeys">Export Keys</string>
+    <string name="menu_exportKey">Export Key</string>
+    <string name="menu_deleteKey">Delete Key</string>
+    <string name="menu_createKey">Create Key</string>
+    <string name="menu_editKey">Edit Key</string>
+
+    <!-- label_lowerCase: capitalized words, no punctuation -->
+    <string name="label_sign">Sign</string>
+    <string name="label_message">Message</string>
+    <string name="label_file">File</string>
+    <string name="label_passPhrase">Pass Phrase</string>
+    <string name="label_passPhraseAgain">Again</string>
+    <string name="label_algorithm">Algorithm</string>
+    <string name="label_asciiArmour">ASCII Armour</string>
+    <string name="label_selectPublicKeys">Public Key(s)</string>
+    <string name="label_deleteAfterEncryption">Delete After Encryption</string>
+    <string name="label_deleteAfterDecryption">Delete After Decryption</string>
+    <string name="label_encryptionAlgorithm">Encryption Algorithm</string>
+    <string name="label_hashAlgorithm">Hash Algorithm</string>
+    <string name="label_asymmetric">Public Key</string>
+    <string name="label_symmetric">Pass Phrase</string>
+
+    <string name="noKeysSelected">Select</string>
+    <string name="oneKeySelected">1 Selected</string>
+    <string name="nKeysSelected">Selected</string>
+    <string name="unknownUserId">&lt;unknown&gt;</string>
+    <string name="none">&lt;none&gt;</string>
+    <string name="noKey">&lt;no key&gt;</string>
+    <string name="noDate">-</string>
+    <string name="noExpiry">&lt;no expiry&gt;</string>
+    <string name="unknownStatus"></string>
+    <string name="canEncrypt">can encrypt</string>
+    <string name="canSign">can sign</string>
+    <string name="expired">expired</string>
+    <string name="notValid">not valid</string>
+
+    <!-- choice_lowerCase: capitalized firwst word, no punctuation -->
+    <string name="choice_signOnly">Sign only</string>
+    <string name="choice_encryptOnly">Encrypt only</string>
+    <string name="choice_signAndEncrypt">Sign and Encrypt</string>
+
+    <string name="dsa">DSA</string>
+    <string name="elgamal">ElGamal</string>
+    <string name="rsa">RSA</string>
+
+    <string name="filemanager_titleOpen">Open...</string>
+    <string name="filemanager_titleSave">Save As...</string>
+    <string name="filemanager_titleEncrypt">Select File To Encrypt...</string>
+    <string name="filemanager_titleDecrypt">Select File To Decrypt...</string>
+    <string name="filemanager_btnOpen">Open</string>
+    <string name="filemanager_btnSave">Save</string>
+
+    <string name="warning">Warning</string>
+    <string name="error">Error</string>
+    <string name="warningMessage">Warning: %s</string>
+    <string name="errorMessage">Error: %s</string>
+
+    <!-- sentences -->
+    <string name="wrongPassPhrase">Wrong pass phrase.</string>
+    <string name="usingClipboardContent">Using clipboard content.</string>
+    <string name="keySaved">Key saved.</string>
+    <string name="setAPassPhrase">Set a pass phrase via the option menu first.</string>
+    <string name="oiFilemanagerNotInstalled">OI File Manager not installed.</string>
+    <string name="passPhrasesDoNotMatch">The pass phrases didn't match.</string>
+    <string name="passPhraseMustNotBeEmpty">Empty pass phrases are not allowed.</string>
+    <string name="passPhraseForSymmetricEncryption">Pass phrase for symmetric encryption:</string>
+    <string name="passPhraseFor">Pass phrase for %s:</string>
+    <string name="fileDeleteConfirmation">Are you sure you want to delete\n%s?</string>
+    <string name="fileDeleteSuccessful">Successfully deleted.</string>
+    <string name="noFileSelected">Select a file first.</string>
+    <string name="decryptionSuccessful">Successfully decrypted.</string>
+    <string name="encryptionSuccessful">Successfully encrypted.</string>
+    <string name="encryptionToClipboardSuccessful">Successfully encrypted to clipboard.</string>
+    <string name="enterPassPhraseTwice">Enter the pass phrase twice.</string>
+    <string name="selectEncryptionKey">Select at least one encryption key.</string>
+    <string name="selectEncryptionOrSignatureKey">Select at least one encryption key or a signature key.</string>
+    <string name="specifyFileToEncryptTo">Please specify which file to encrypt to.\nWARNING! File will be overwritten if it exists.</string>
+    <string name="specifyFileToDecryptTo">Please specify which file to decrypt to.\nWARNING! File will be overwritten if it exists.</string>
+    <string name="specifyGoogleMailAccount">Specify the Google Mail account you want to add.</string>
+    <string name="specifyFileToImportFrom">Please specify which file to import from.</string>
+    <string name="specifyFileToExportTo">Please specify which file to export to.\nWARNING! File will be overwritten if it exists.</string>
+    <string name="specifyFileToExportSecretKeysTo">Please specify which file to export to.\nWARNING! You are about to export SECRET keys.\nWARNING! File will be overwritten if it exists.</string>
+    <string name="keyDeletionConfirmation">Do you really want to delete the key '%s'?\nYou can't undo this!</string>
+    <string name="secretKeyDeletionConfirmation">Do you really want to delete the SECRET key '%s'?\nYou can't undo this!</string>
+    <string name="keysAddedAndUpdated">Succssfully added %s keys and updated %s keys."</string>
+    <string name="keysAdded">Succssfully added %s keys.</string>
+    <string name="keysUpdated">Succssfully updated %s keys.</string>
+    <string name="noKeysAddedOrUpdated">No keys added or updated.</string>
+    <string name="keyExported">Succssfully exported 1 key.</string>
+    <string name="keysExported">Succssfully exported %s keys.</string>
+    <string name="noKeysExported">No keys exported.</string>
+    <string name="keyCreationElGamalInfo">Note: only subkeys support ElGamal, and for ElGamal the nearest keysize of 1536, 2048, 3072, 4096, or 8192 will be used.</string>
+
+    <!-- error_lowerCase: phrases, no punctuation, all lowercase,
+         they will be put after "errorMessage", e.g. "Error: file not found" -->
+    <string name="error_fileDeleteFailed">deleting '%s' failed</string>
+    <string name="error_fileNotFound">file not found</string>
+    <string name="error_noSecretKeyFound">no suitable secret key found</string>
+    <string name="error_noKnownEncryptionFound">no known kind of encryption found</string>
+    <string name="error_externalStorageNotReady">external storage not ready</string>
+    <string name="error_accountNotFound">account '%s' not found</string>
+    <string name="error_addingAccountFailed">adding account '%s' failed</string>
+    <string name="error_invalidEmail">invalid email '%s'</string>
+    <string name="error_keySizeMinimum512bit">key size must be at least 512bit</string>
+    <string name="error_masterKeyMustNotBeElGamal">the master key cannot be an ElGamal key</string>
+    <string name="error_unknownAlgorithmChoice">unknown algorithm choice</string>
+    <string name="error_userIdNeedsAName">you need to specify a name</string>
+    <string name="error_userIdNeedsAnEmailAddress">you need to specify an email address</string>
+    <string name="error_keyNeedsAUserId">need at least one user id</string>
+    <string name="error_mainUserIdMustNotBeEmpty">main user id must not be empty</string>
+    <string name="error_keyNeedsMasterKey">need at least a master key</string>
+    <string name="error_expiryMustComeAfterCreation">expiry date must come after creation date</string>
+    <string name="error_noEncryptionKeysOrPassPhrase">no encryption key(s) or pass phrase given</string>
+    <string name="error_signatureFailed">signature failed</string>
+    <string name="error_noSignaturePassPhrase">no pass phrase given</string>
+    <string name="error_noSignatureKey">no signature key given</string>
+    <string name="error_invalidData">not valid encryption data</string>
+    <string name="error_corruptData">corrupt data</string>
+    <string name="error_noSymmetricEncryptionPacket">couldn't find a packet with symmetric encryption</string>
+    <string name="error_wrongPassPhrase">wrong pass phrase</string>
+    <string name="error_savingKeys">error saving some key(s)</string>
+
+    <!-- progress_lowerCase: lowercase, phrases, usually ending in '...' -->
+    <string name="progress_done">done.</string>
+    <string name="progress_initializing">initializing...</string>
+    <string name="progress_saving">saving...</string>
+    <string name="progress_importing">importing...</string>
+    <string name="progress_exporting">exporting...</string>
+    <string name="progress_generating">generating key, this can take a while...</string>
+    <string name="progress_buildingKey">building key...</string>
+    <string name="progress_preparingMasterKey">preparing master key...</string>
+    <string name="progress_certifyingMasterKey">certifying master key...</string>
+    <string name="progress_buildingMasterKeyRing">building master key ring...</string>
+    <string name="progress_addingSubKeys">adding sub keys...</string>
+    <string name="progress_savingKeyRing">saving key ring...</string>
+    <string name="progress_importingSecretKeys">importing secret keys...</string>
+    <string name="progress_importingPublicKeys">importing public keys...</string>
+    <string name="progress_reloadingKeys">reloading keys...</string>
+    <string name="progress_exportingKey">exporting key...</string>
+    <string name="progress_exportingKeys">exporting keys...</string>
+    <string name="progress_extractingSignatureKey">extracting signature key...</string>
+    <string name="progress_extractingKey">extracting key...</string>
+    <string name="progress_preparingStreams">preparing streams...</string>
+    <string name="progress_encrypting">encrypting data...</string>
+    <string name="progress_decrypting">decrypting data...</string>
+    <string name="progress_preparingSignature">preparing signature...</string>
+    <string name="progress_generatingSignature">generating signature...</string>
+    <string name="progress_processingSignature">processing signature...</string>
+    <string name="progress_verifyingSignature">verifying signature...</string>
+    <string name="progress_signing">signing...</string>
+    <string name="progress_readingData">reading data...</string>
+    <string name="progress_findingKey">finding key...</string>
+    <string name="progress_decompressingData">decompressing data...</string>
+    <string name="progress_verifyingIntegrity">verifying integrity...</string>
+
+</resources>
+
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
new file mode 100644
index 000000000..5bb4dc2ba
--- /dev/null
+++ b/res/values-ko/strings.xml
@@ -0,0 +1,230 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 Thialfihar <thi@thialfihar.org>
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<resources>
+    <string name="app_name">APG</string>
+
+    <!-- title_lowerCase: capitalized words, no punctuation -->
+    <string name="title_mailInbox">Mail Inbox</string>
+    <string name="title_managePublicKeys">Manage Public Keys</string>
+    <string name="title_manageSecretKeys">Manage Secret Keys</string>
+    <string name="title_selectRecipients">Select Recipients</string>
+    <string name="title_selectSignature">Select Signature</string>
+    <string name="title_encrypt">Encrypt</string>
+    <string name="title_decrypt">Decrypt</string>
+    <string name="title_authentification">Authentification</string>
+    <string name="title_createKey">Create Key</string>
+    <string name="title_editKey">Edit Key</string>
+    <string name="title_preferences">Preferences</string>
+    <string name="title_changePassPhrase">Change Pass Phrase</string>
+    <string name="title_setPassPhrase">Set Pass Phrase</string>
+    <string name="title_sendEmail">"Send Mail..."</string>
+    <string name="title_encryptToFile">Encrypt To File</string>
+    <string name="title_decryptToFile">Decrypt To File</string>
+    <string name="title_addAccount">Add Account</string>
+    <string name="title_importKeys">Import Keys</string>
+    <string name="title_exportKey">Export Key</string>
+    <string name="title_exportKeys">Export Keys</string>
+
+    <!-- section_lowerCase: capitalized words, no punctuation -->
+    <string name="section_userIds">User IDs</string>
+    <string name="section_keys">Keys</string>
+    <string name="section_defaults">Defaults</string>
+
+    <!-- btn_lowerCase: capitalized words, no punctuation -->
+    <string name="btn_encryptToClipboard">Encrypt To Clipboard</string>
+    <string name="btn_send">Encrypt And Email</string>
+    <string name="btn_encrypt">Encrypt</string>
+    <string name="btn_decrypt">Decrypt</string>
+    <string name="btn_verify">Verify</string>
+    <string name="btn_selectEncryptKeys">Select Recipients</string>
+    <string name="btn_reply">Reply</string>
+    <string name="btn_encryptMessage">Encrypt Message</string>
+    <string name="btn_decryptMessage">Decrypt Message</string>
+    <string name="btn_encryptFile">Encrypt File</string>
+    <string name="btn_decryptFile">Decrypt File</string>
+    <string name="btn_save">Save</string>
+    <string name="btn_doNotSave">Cancel</string>
+    <string name="btn_delete">Delete</string>
+    <string name="btn_noDate">None</string>
+
+    <!-- menu_lowerCase: capitalized words, no punctuation -->
+    <string name="menu_about">About</string>
+    <string name="menu_addAccount">Add GMail Account</string>
+    <string name="menu_deleteAccount">Delete Account</string>
+    <string name="menu_managePublicKeys">Manage Public Keys</string>
+    <string name="menu_manageSecretKeys">Manage Secret Keys</string>
+    <string name="menu_preferences">Settings</string>
+    <string name="menu_changePassPhrase">Change Pass Phrase</string>
+    <string name="menu_setPassPhrase">Set Pass Phrase</string>
+    <string name="menu_importKeys">Import Keys</string>
+    <string name="menu_exportKeys">Export Keys</string>
+    <string name="menu_exportKey">Export Key</string>
+    <string name="menu_deleteKey">Delete Key</string>
+    <string name="menu_createKey">Create Key</string>
+    <string name="menu_editKey">Edit Key</string>
+
+    <!-- label_lowerCase: capitalized words, no punctuation -->
+    <string name="label_sign">Sign</string>
+    <string name="label_message">Message</string>
+    <string name="label_file">File</string>
+    <string name="label_passPhrase">Pass Phrase</string>
+    <string name="label_passPhraseAgain">Again</string>
+    <string name="label_algorithm">Algorithm</string>
+    <string name="label_asciiArmour">ASCII Armour</string>
+    <string name="label_selectPublicKeys">Public Key(s)</string>
+    <string name="label_deleteAfterEncryption">Delete After Encryption</string>
+    <string name="label_deleteAfterDecryption">Delete After Decryption</string>
+    <string name="label_encryptionAlgorithm">Encryption Algorithm</string>
+    <string name="label_hashAlgorithm">Hash Algorithm</string>
+    <string name="label_asymmetric">Public Key</string>
+    <string name="label_symmetric">Pass Phrase</string>
+
+    <string name="noKeysSelected">Select</string>
+    <string name="oneKeySelected">1 Selected</string>
+    <string name="nKeysSelected">Selected</string>
+    <string name="unknownUserId">&lt;unknown&gt;</string>
+    <string name="none">&lt;none&gt;</string>
+    <string name="noKey">&lt;no key&gt;</string>
+    <string name="noDate">-</string>
+    <string name="noExpiry">&lt;no expiry&gt;</string>
+    <string name="unknownStatus"></string>
+    <string name="canEncrypt">can encrypt</string>
+    <string name="canSign">can sign</string>
+    <string name="expired">expired</string>
+    <string name="notValid">not valid</string>
+
+    <!-- choice_lowerCase: capitalized firwst word, no punctuation -->
+    <string name="choice_signOnly">Sign only</string>
+    <string name="choice_encryptOnly">Encrypt only</string>
+    <string name="choice_signAndEncrypt">Sign and Encrypt</string>
+
+    <string name="dsa">DSA</string>
+    <string name="elgamal">ElGamal</string>
+    <string name="rsa">RSA</string>
+
+    <string name="filemanager_titleOpen">Open...</string>
+    <string name="filemanager_titleSave">Save As...</string>
+    <string name="filemanager_titleEncrypt">Select File To Encrypt...</string>
+    <string name="filemanager_titleDecrypt">Select File To Decrypt...</string>
+    <string name="filemanager_btnOpen">Open</string>
+    <string name="filemanager_btnSave">Save</string>
+
+    <string name="warning">Warning</string>
+    <string name="error">Error</string>
+    <string name="warningMessage">Warning: %s</string>
+    <string name="errorMessage">Error: %s</string>
+
+    <!-- sentences -->
+    <string name="wrongPassPhrase">Wrong pass phrase.</string>
+    <string name="usingClipboardContent">Using clipboard content.</string>
+    <string name="keySaved">Key saved.</string>
+    <string name="setAPassPhrase">Set a pass phrase via the option menu first.</string>
+    <string name="oiFilemanagerNotInstalled">OI File Manager not installed.</string>
+    <string name="passPhrasesDoNotMatch">The pass phrases didn't match.</string>
+    <string name="passPhraseMustNotBeEmpty">Empty pass phrases are not allowed.</string>
+    <string name="passPhraseForSymmetricEncryption">Pass phrase for symmetric encryption:</string>
+    <string name="passPhraseFor">Pass phrase for %s:</string>
+    <string name="fileDeleteConfirmation">Are you sure you want to delete\n%s?</string>
+    <string name="fileDeleteSuccessful">Successfully deleted.</string>
+    <string name="noFileSelected">Select a file first.</string>
+    <string name="decryptionSuccessful">Successfully decrypted.</string>
+    <string name="encryptionSuccessful">Successfully encrypted.</string>
+    <string name="encryptionToClipboardSuccessful">Successfully encrypted to clipboard.</string>
+    <string name="enterPassPhraseTwice">Enter the pass phrase twice.</string>
+    <string name="selectEncryptionKey">Select at least one encryption key.</string>
+    <string name="selectEncryptionOrSignatureKey">Select at least one encryption key or a signature key.</string>
+    <string name="specifyFileToEncryptTo">Please specify which file to encrypt to.\nWARNING! File will be overwritten if it exists.</string>
+    <string name="specifyFileToDecryptTo">Please specify which file to decrypt to.\nWARNING! File will be overwritten if it exists.</string>
+    <string name="specifyGoogleMailAccount">Specify the Google Mail account you want to add.</string>
+    <string name="specifyFileToImportFrom">Please specify which file to import from.</string>
+    <string name="specifyFileToExportTo">Please specify which file to export to.\nWARNING! File will be overwritten if it exists.</string>
+    <string name="specifyFileToExportSecretKeysTo">Please specify which file to export to.\nWARNING! You are about to export SECRET keys.\nWARNING! File will be overwritten if it exists.</string>
+    <string name="keyDeletionConfirmation">Do you really want to delete the key '%s'?\nYou can't undo this!</string>
+    <string name="secretKeyDeletionConfirmation">Do you really want to delete the SECRET key '%s'?\nYou can't undo this!</string>
+    <string name="keysAddedAndUpdated">Succssfully added %s keys and updated %s keys."</string>
+    <string name="keysAdded">Succssfully added %s keys.</string>
+    <string name="keysUpdated">Succssfully updated %s keys.</string>
+    <string name="noKeysAddedOrUpdated">No keys added or updated.</string>
+    <string name="keyExported">Succssfully exported 1 key.</string>
+    <string name="keysExported">Succssfully exported %s keys.</string>
+    <string name="noKeysExported">No keys exported.</string>
+    <string name="keyCreationElGamalInfo">Note: only subkeys support ElGamal, and for ElGamal the nearest keysize of 1536, 2048, 3072, 4096, or 8192 will be used.</string>
+
+    <!-- error_lowerCase: phrases, no punctuation, all lowercase,
+         they will be put after "errorMessage", e.g. "Error: file not found" -->
+    <string name="error_fileDeleteFailed">deleting '%s' failed</string>
+    <string name="error_fileNotFound">file not found</string>
+    <string name="error_noSecretKeyFound">no suitable secret key found</string>
+    <string name="error_noKnownEncryptionFound">no known kind of encryption found</string>
+    <string name="error_externalStorageNotReady">external storage not ready</string>
+    <string name="error_accountNotFound">account '%s' not found</string>
+    <string name="error_addingAccountFailed">adding account '%s' failed</string>
+    <string name="error_invalidEmail">invalid email '%s'</string>
+    <string name="error_keySizeMinimum512bit">key size must be at least 512bit</string>
+    <string name="error_masterKeyMustNotBeElGamal">the master key cannot be an ElGamal key</string>
+    <string name="error_unknownAlgorithmChoice">unknown algorithm choice</string>
+    <string name="error_userIdNeedsAName">you need to specify a name</string>
+    <string name="error_userIdNeedsAnEmailAddress">you need to specify an email address</string>
+    <string name="error_keyNeedsAUserId">need at least one user id</string>
+    <string name="error_mainUserIdMustNotBeEmpty">main user id must not be empty</string>
+    <string name="error_keyNeedsMasterKey">need at least a master key</string>
+    <string name="error_expiryMustComeAfterCreation">expiry date must come after creation date</string>
+    <string name="error_noEncryptionKeysOrPassPhrase">no encryption key(s) or pass phrase given</string>
+    <string name="error_signatureFailed">signature failed</string>
+    <string name="error_noSignaturePassPhrase">no pass phrase given</string>
+    <string name="error_noSignatureKey">no signature key given</string>
+    <string name="error_invalidData">not valid encryption data</string>
+    <string name="error_corruptData">corrupt data</string>
+    <string name="error_noSymmetricEncryptionPacket">couldn't find a packet with symmetric encryption</string>
+    <string name="error_wrongPassPhrase">wrong pass phrase</string>
+    <string name="error_savingKeys">error saving some key(s)</string>
+
+    <!-- progress_lowerCase: lowercase, phrases, usually ending in '...' -->
+    <string name="progress_done">done.</string>
+    <string name="progress_initializing">initializing...</string>
+    <string name="progress_saving">saving...</string>
+    <string name="progress_importing">importing...</string>
+    <string name="progress_exporting">exporting...</string>
+    <string name="progress_generating">generating key, this can take a while...</string>
+    <string name="progress_buildingKey">building key...</string>
+    <string name="progress_preparingMasterKey">preparing master key...</string>
+    <string name="progress_certifyingMasterKey">certifying master key...</string>
+    <string name="progress_buildingMasterKeyRing">building master key ring...</string>
+    <string name="progress_addingSubKeys">adding sub keys...</string>
+    <string name="progress_savingKeyRing">saving key ring...</string>
+    <string name="progress_importingSecretKeys">importing secret keys...</string>
+    <string name="progress_importingPublicKeys">importing public keys...</string>
+    <string name="progress_reloadingKeys">reloading keys...</string>
+    <string name="progress_exportingKey">exporting key...</string>
+    <string name="progress_exportingKeys">exporting keys...</string>
+    <string name="progress_extractingSignatureKey">extracting signature key...</string>
+    <string name="progress_extractingKey">extracting key...</string>
+    <string name="progress_preparingStreams">preparing streams...</string>
+    <string name="progress_encrypting">encrypting data...</string>
+    <string name="progress_decrypting">decrypting data...</string>
+    <string name="progress_preparingSignature">preparing signature...</string>
+    <string name="progress_generatingSignature">generating signature...</string>
+    <string name="progress_processingSignature">processing signature...</string>
+    <string name="progress_verifyingSignature">verifying signature...</string>
+    <string name="progress_signing">signing...</string>
+    <string name="progress_readingData">reading data...</string>
+    <string name="progress_findingKey">finding key...</string>
+    <string name="progress_decompressingData">decompressing data...</string>
+    <string name="progress_verifyingIntegrity">verifying integrity...</string>
+
+</resources>
+
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
new file mode 100644
index 000000000..5bb4dc2ba
--- /dev/null
+++ b/res/values-ru/strings.xml
@@ -0,0 +1,230 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 Thialfihar <thi@thialfihar.org>
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<resources>
+    <string name="app_name">APG</string>
+
+    <!-- title_lowerCase: capitalized words, no punctuation -->
+    <string name="title_mailInbox">Mail Inbox</string>
+    <string name="title_managePublicKeys">Manage Public Keys</string>
+    <string name="title_manageSecretKeys">Manage Secret Keys</string>
+    <string name="title_selectRecipients">Select Recipients</string>
+    <string name="title_selectSignature">Select Signature</string>
+    <string name="title_encrypt">Encrypt</string>
+    <string name="title_decrypt">Decrypt</string>
+    <string name="title_authentification">Authentification</string>
+    <string name="title_createKey">Create Key</string>
+    <string name="title_editKey">Edit Key</string>
+    <string name="title_preferences">Preferences</string>
+    <string name="title_changePassPhrase">Change Pass Phrase</string>
+    <string name="title_setPassPhrase">Set Pass Phrase</string>
+    <string name="title_sendEmail">"Send Mail..."</string>
+    <string name="title_encryptToFile">Encrypt To File</string>
+    <string name="title_decryptToFile">Decrypt To File</string>
+    <string name="title_addAccount">Add Account</string>
+    <string name="title_importKeys">Import Keys</string>
+    <string name="title_exportKey">Export Key</string>
+    <string name="title_exportKeys">Export Keys</string>
+
+    <!-- section_lowerCase: capitalized words, no punctuation -->
+    <string name="section_userIds">User IDs</string>
+    <string name="section_keys">Keys</string>
+    <string name="section_defaults">Defaults</string>
+
+    <!-- btn_lowerCase: capitalized words, no punctuation -->
+    <string name="btn_encryptToClipboard">Encrypt To Clipboard</string>
+    <string name="btn_send">Encrypt And Email</string>
+    <string name="btn_encrypt">Encrypt</string>
+    <string name="btn_decrypt">Decrypt</string>
+    <string name="btn_verify">Verify</string>
+    <string name="btn_selectEncryptKeys">Select Recipients</string>
+    <string name="btn_reply">Reply</string>
+    <string name="btn_encryptMessage">Encrypt Message</string>
+    <string name="btn_decryptMessage">Decrypt Message</string>
+    <string name="btn_encryptFile">Encrypt File</string>
+    <string name="btn_decryptFile">Decrypt File</string>
+    <string name="btn_save">Save</string>
+    <string name="btn_doNotSave">Cancel</string>
+    <string name="btn_delete">Delete</string>
+    <string name="btn_noDate">None</string>
+
+    <!-- menu_lowerCase: capitalized words, no punctuation -->
+    <string name="menu_about">About</string>
+    <string name="menu_addAccount">Add GMail Account</string>
+    <string name="menu_deleteAccount">Delete Account</string>
+    <string name="menu_managePublicKeys">Manage Public Keys</string>
+    <string name="menu_manageSecretKeys">Manage Secret Keys</string>
+    <string name="menu_preferences">Settings</string>
+    <string name="menu_changePassPhrase">Change Pass Phrase</string>
+    <string name="menu_setPassPhrase">Set Pass Phrase</string>
+    <string name="menu_importKeys">Import Keys</string>
+    <string name="menu_exportKeys">Export Keys</string>
+    <string name="menu_exportKey">Export Key</string>
+    <string name="menu_deleteKey">Delete Key</string>
+    <string name="menu_createKey">Create Key</string>
+    <string name="menu_editKey">Edit Key</string>
+
+    <!-- label_lowerCase: capitalized words, no punctuation -->
+    <string name="label_sign">Sign</string>
+    <string name="label_message">Message</string>
+    <string name="label_file">File</string>
+    <string name="label_passPhrase">Pass Phrase</string>
+    <string name="label_passPhraseAgain">Again</string>
+    <string name="label_algorithm">Algorithm</string>
+    <string name="label_asciiArmour">ASCII Armour</string>
+    <string name="label_selectPublicKeys">Public Key(s)</string>
+    <string name="label_deleteAfterEncryption">Delete After Encryption</string>
+    <string name="label_deleteAfterDecryption">Delete After Decryption</string>
+    <string name="label_encryptionAlgorithm">Encryption Algorithm</string>
+    <string name="label_hashAlgorithm">Hash Algorithm</string>
+    <string name="label_asymmetric">Public Key</string>
+    <string name="label_symmetric">Pass Phrase</string>
+
+    <string name="noKeysSelected">Select</string>
+    <string name="oneKeySelected">1 Selected</string>
+    <string name="nKeysSelected">Selected</string>
+    <string name="unknownUserId">&lt;unknown&gt;</string>
+    <string name="none">&lt;none&gt;</string>
+    <string name="noKey">&lt;no key&gt;</string>
+    <string name="noDate">-</string>
+    <string name="noExpiry">&lt;no expiry&gt;</string>
+    <string name="unknownStatus"></string>
+    <string name="canEncrypt">can encrypt</string>
+    <string name="canSign">can sign</string>
+    <string name="expired">expired</string>
+    <string name="notValid">not valid</string>
+
+    <!-- choice_lowerCase: capitalized firwst word, no punctuation -->
+    <string name="choice_signOnly">Sign only</string>
+    <string name="choice_encryptOnly">Encrypt only</string>
+    <string name="choice_signAndEncrypt">Sign and Encrypt</string>
+
+    <string name="dsa">DSA</string>
+    <string name="elgamal">ElGamal</string>
+    <string name="rsa">RSA</string>
+
+    <string name="filemanager_titleOpen">Open...</string>
+    <string name="filemanager_titleSave">Save As...</string>
+    <string name="filemanager_titleEncrypt">Select File To Encrypt...</string>
+    <string name="filemanager_titleDecrypt">Select File To Decrypt...</string>
+    <string name="filemanager_btnOpen">Open</string>
+    <string name="filemanager_btnSave">Save</string>
+
+    <string name="warning">Warning</string>
+    <string name="error">Error</string>
+    <string name="warningMessage">Warning: %s</string>
+    <string name="errorMessage">Error: %s</string>
+
+    <!-- sentences -->
+    <string name="wrongPassPhrase">Wrong pass phrase.</string>
+    <string name="usingClipboardContent">Using clipboard content.</string>
+    <string name="keySaved">Key saved.</string>
+    <string name="setAPassPhrase">Set a pass phrase via the option menu first.</string>
+    <string name="oiFilemanagerNotInstalled">OI File Manager not installed.</string>
+    <string name="passPhrasesDoNotMatch">The pass phrases didn't match.</string>
+    <string name="passPhraseMustNotBeEmpty">Empty pass phrases are not allowed.</string>
+    <string name="passPhraseForSymmetricEncryption">Pass phrase for symmetric encryption:</string>
+    <string name="passPhraseFor">Pass phrase for %s:</string>
+    <string name="fileDeleteConfirmation">Are you sure you want to delete\n%s?</string>
+    <string name="fileDeleteSuccessful">Successfully deleted.</string>
+    <string name="noFileSelected">Select a file first.</string>
+    <string name="decryptionSuccessful">Successfully decrypted.</string>
+    <string name="encryptionSuccessful">Successfully encrypted.</string>
+    <string name="encryptionToClipboardSuccessful">Successfully encrypted to clipboard.</string>
+    <string name="enterPassPhraseTwice">Enter the pass phrase twice.</string>
+    <string name="selectEncryptionKey">Select at least one encryption key.</string>
+    <string name="selectEncryptionOrSignatureKey">Select at least one encryption key or a signature key.</string>
+    <string name="specifyFileToEncryptTo">Please specify which file to encrypt to.\nWARNING! File will be overwritten if it exists.</string>
+    <string name="specifyFileToDecryptTo">Please specify which file to decrypt to.\nWARNING! File will be overwritten if it exists.</string>
+    <string name="specifyGoogleMailAccount">Specify the Google Mail account you want to add.</string>
+    <string name="specifyFileToImportFrom">Please specify which file to import from.</string>
+    <string name="specifyFileToExportTo">Please specify which file to export to.\nWARNING! File will be overwritten if it exists.</string>
+    <string name="specifyFileToExportSecretKeysTo">Please specify which file to export to.\nWARNING! You are about to export SECRET keys.\nWARNING! File will be overwritten if it exists.</string>
+    <string name="keyDeletionConfirmation">Do you really want to delete the key '%s'?\nYou can't undo this!</string>
+    <string name="secretKeyDeletionConfirmation">Do you really want to delete the SECRET key '%s'?\nYou can't undo this!</string>
+    <string name="keysAddedAndUpdated">Succssfully added %s keys and updated %s keys."</string>
+    <string name="keysAdded">Succssfully added %s keys.</string>
+    <string name="keysUpdated">Succssfully updated %s keys.</string>
+    <string name="noKeysAddedOrUpdated">No keys added or updated.</string>
+    <string name="keyExported">Succssfully exported 1 key.</string>
+    <string name="keysExported">Succssfully exported %s keys.</string>
+    <string name="noKeysExported">No keys exported.</string>
+    <string name="keyCreationElGamalInfo">Note: only subkeys support ElGamal, and for ElGamal the nearest keysize of 1536, 2048, 3072, 4096, or 8192 will be used.</string>
+
+    <!-- error_lowerCase: phrases, no punctuation, all lowercase,
+         they will be put after "errorMessage", e.g. "Error: file not found" -->
+    <string name="error_fileDeleteFailed">deleting '%s' failed</string>
+    <string name="error_fileNotFound">file not found</string>
+    <string name="error_noSecretKeyFound">no suitable secret key found</string>
+    <string name="error_noKnownEncryptionFound">no known kind of encryption found</string>
+    <string name="error_externalStorageNotReady">external storage not ready</string>
+    <string name="error_accountNotFound">account '%s' not found</string>
+    <string name="error_addingAccountFailed">adding account '%s' failed</string>
+    <string name="error_invalidEmail">invalid email '%s'</string>
+    <string name="error_keySizeMinimum512bit">key size must be at least 512bit</string>
+    <string name="error_masterKeyMustNotBeElGamal">the master key cannot be an ElGamal key</string>
+    <string name="error_unknownAlgorithmChoice">unknown algorithm choice</string>
+    <string name="error_userIdNeedsAName">you need to specify a name</string>
+    <string name="error_userIdNeedsAnEmailAddress">you need to specify an email address</string>
+    <string name="error_keyNeedsAUserId">need at least one user id</string>
+    <string name="error_mainUserIdMustNotBeEmpty">main user id must not be empty</string>
+    <string name="error_keyNeedsMasterKey">need at least a master key</string>
+    <string name="error_expiryMustComeAfterCreation">expiry date must come after creation date</string>
+    <string name="error_noEncryptionKeysOrPassPhrase">no encryption key(s) or pass phrase given</string>
+    <string name="error_signatureFailed">signature failed</string>
+    <string name="error_noSignaturePassPhrase">no pass phrase given</string>
+    <string name="error_noSignatureKey">no signature key given</string>
+    <string name="error_invalidData">not valid encryption data</string>
+    <string name="error_corruptData">corrupt data</string>
+    <string name="error_noSymmetricEncryptionPacket">couldn't find a packet with symmetric encryption</string>
+    <string name="error_wrongPassPhrase">wrong pass phrase</string>
+    <string name="error_savingKeys">error saving some key(s)</string>
+
+    <!-- progress_lowerCase: lowercase, phrases, usually ending in '...' -->
+    <string name="progress_done">done.</string>
+    <string name="progress_initializing">initializing...</string>
+    <string name="progress_saving">saving...</string>
+    <string name="progress_importing">importing...</string>
+    <string name="progress_exporting">exporting...</string>
+    <string name="progress_generating">generating key, this can take a while...</string>
+    <string name="progress_buildingKey">building key...</string>
+    <string name="progress_preparingMasterKey">preparing master key...</string>
+    <string name="progress_certifyingMasterKey">certifying master key...</string>
+    <string name="progress_buildingMasterKeyRing">building master key ring...</string>
+    <string name="progress_addingSubKeys">adding sub keys...</string>
+    <string name="progress_savingKeyRing">saving key ring...</string>
+    <string name="progress_importingSecretKeys">importing secret keys...</string>
+    <string name="progress_importingPublicKeys">importing public keys...</string>
+    <string name="progress_reloadingKeys">reloading keys...</string>
+    <string name="progress_exportingKey">exporting key...</string>
+    <string name="progress_exportingKeys">exporting keys...</string>
+    <string name="progress_extractingSignatureKey">extracting signature key...</string>
+    <string name="progress_extractingKey">extracting key...</string>
+    <string name="progress_preparingStreams">preparing streams...</string>
+    <string name="progress_encrypting">encrypting data...</string>
+    <string name="progress_decrypting">decrypting data...</string>
+    <string name="progress_preparingSignature">preparing signature...</string>
+    <string name="progress_generatingSignature">generating signature...</string>
+    <string name="progress_processingSignature">processing signature...</string>
+    <string name="progress_verifyingSignature">verifying signature...</string>
+    <string name="progress_signing">signing...</string>
+    <string name="progress_readingData">reading data...</string>
+    <string name="progress_findingKey">finding key...</string>
+    <string name="progress_decompressingData">decompressing data...</string>
+    <string name="progress_verifyingIntegrity">verifying integrity...</string>
+
+</resources>
+
diff --git a/res/values/strings.xml b/res/values/strings.xml
index b1fa76915..856ed0c4e 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -16,53 +16,226 @@
 
 <resources>
     <string name="app_name">APG</string>
+
+    <!-- title_lowerCase: capitalized words, no punctuation -->
     <string name="title_mailInbox">Mail Inbox</string>
     <string name="title_managePublicKeys">Manage Public Keys</string>
     <string name="title_manageSecretKeys">Manage Secret Keys</string>
     <string name="title_selectRecipients">Select Recipients</string>
     <string name="title_selectSignature">Select Signature</string>
-    <string name="title_encryptMessage">Encrypt Message</string>
-    <string name="title_decryptMessage">Decrypt Message</string>
+    <string name="title_encrypt">Encrypt</string>
+    <string name="title_decrypt">Decrypt</string>
     <string name="title_authentification">Authentification</string>
     <string name="title_createKey">Create Key</string>
     <string name="title_editKey">Edit Key</string>
+    <string name="title_preferences">Preferences</string>
+    <string name="title_changePassPhrase">Change Pass Phrase</string>
+    <string name="title_setPassPhrase">Set Pass Phrase</string>
+    <string name="title_sendEmail">"Send Mail..."</string>
+    <string name="title_encryptToFile">Encrypt To File</string>
+    <string name="title_decryptToFile">Decrypt To File</string>
+    <string name="title_addAccount">Add Account</string>
+    <string name="title_importKeys">Import Keys</string>
+    <string name="title_exportKey">Export Key</string>
+    <string name="title_exportKeys">Export Keys</string>
 
+    <!-- section_lowerCase: capitalized words, no punctuation -->
     <string name="section_userIds">User IDs</string>
     <string name="section_keys">Keys</string>
+    <string name="section_general">General</string>
+    <string name="section_defaults">Defaults</string>
 
-    <string name="btn_send">Send via Email</string>
+    <!-- btn_lowerCase: capitalized words, no punctuation -->
+    <string name="btn_encryptToClipboard">Encrypt To Clipboard</string>
+    <string name="btn_send">Encrypt And Email</string>
+    <string name="btn_encrypt">Encrypt</string>
     <string name="btn_decrypt">Decrypt</string>
+    <string name="btn_verify">Verify</string>
     <string name="btn_selectEncryptKeys">Select Recipients</string>
     <string name="btn_reply">Reply</string>
     <string name="btn_encryptMessage">Encrypt Message</string>
     <string name="btn_decryptMessage">Decrypt Message</string>
+    <string name="btn_encryptFile">Encrypt File</string>
+    <string name="btn_decryptFile">Decrypt File</string>
     <string name="btn_save">Save</string>
     <string name="btn_doNotSave">Cancel</string>
+    <string name="btn_delete">Delete</string>
+    <string name="btn_noDate">None</string>
 
+    <!-- menu_lowerCase: capitalized words, no punctuation -->
     <string name="menu_about">About</string>
     <string name="menu_addAccount">Add GMail Account</string>
+    <string name="menu_deleteAccount">Delete Account</string>
     <string name="menu_managePublicKeys">Manage Public Keys</string>
     <string name="menu_manageSecretKeys">Manage Secret Keys</string>
+    <string name="menu_preferences">Settings</string>
+    <string name="menu_changePassPhrase">Change Pass Phrase</string>
+    <string name="menu_setPassPhrase">Set Pass Phrase</string>
+    <string name="menu_importKeys">Import Keys</string>
+    <string name="menu_exportKeys">Export Keys</string>
+    <string name="menu_exportKey">Export Key</string>
+    <string name="menu_deleteKey">Delete Key</string>
+    <string name="menu_createKey">Create Key</string>
+    <string name="menu_editKey">Edit Key</string>
+
+    <!-- label_lowerCase: capitalized words, no punctuation -->
+    <string name="label_sign">Sign</string>
+    <string name="label_message">Message</string>
+    <string name="label_file">File</string>
+    <string name="label_passPhrase">Pass Phrase</string>
+    <string name="label_passPhraseAgain">Again</string>
+    <string name="label_algorithm">Algorithm</string>
+    <string name="label_asciiArmour">ASCII Armour</string>
+    <string name="label_selectPublicKeys">Public Key(s)</string>
+    <string name="label_deleteAfterEncryption">Delete After Encryption</string>
+    <string name="label_deleteAfterDecryption">Delete After Decryption</string>
+    <string name="label_encryptionAlgorithm">Encryption Algorithm</string>
+    <string name="label_hashAlgorithm">Hash Algorithm</string>
+    <string name="label_asymmetric">Public Key</string>
+    <string name="label_symmetric">Pass Phrase</string>
+    <string name="label_passPhraseCacheTtl">Pass Phrase Cache</string>
+    <string name="label_messageCompression">Message Compression</string>
+    <string name="label_fileCompression">File Compression</string>
 
-    <string name="sign">Sign</string>
-    <string name="sign_as">Sign as</string>
-    <string name="no_keys_selected">Select Recipients</string>
-    <string name="one_key_selected">1 Recipient</string>
-    <string name="n_keys_selected">Recipients</string>
-    <string name="unknown_user_id">&lt;unknown&gt;</string>
+    <string name="noKeysSelected">Select</string>
+    <string name="oneKeySelected">1 Selected</string>
+    <string name="nKeysSelected">Selected</string>
+    <string name="unknownUserId">&lt;unknown&gt;</string>
     <string name="none">&lt;none&gt;</string>
+    <string name="noKey">&lt;no key&gt;</string>
+    <string name="noDate">-</string>
+    <string name="noExpiry">&lt;no expiry&gt;</string>
+    <string name="unknownStatus"></string>
+    <string name="canEncrypt">can encrypt</string>
+    <string name="canSign">can sign</string>
+    <string name="expired">expired</string>
+    <string name="notValid">not valid</string>
 
-    <string name="sign_only">Sign only</string>
-    <string name="encrypt_only">Encrypt only</string>
-    <string name="sign_and_encrypt">Sign and Encrypt</string>
+    <!-- choice_lowerCase: capitalized firwst word, no punctuation -->
+    <string name="choice_none">None</string>
+    <string name="choice_signOnly">Sign only</string>
+    <string name="choice_encryptOnly">Encrypt only</string>
+    <string name="choice_signAndEncrypt">Sign and Encrypt</string>
+    <string name="choice_15secs">15 secs</string>
+    <string name="choice_1min">1 min</string>
+    <string name="choice_3mins">3 mins</string>
+    <string name="choice_5mins">5 mins</string>
+    <string name="choice_10mins">10 mins</string>
+    <string name="choice_untilQuit">until quit</string>
 
     <string name="dsa">DSA</string>
     <string name="elgamal">ElGamal</string>
     <string name="rsa">RSA</string>
 
-    <string name="wrong_pass_phrase">Wrong pass phrase.</string>
-    <string name="using_clipboard_content">Using clipboard content.</string>
-    <string name="key_saved">Key saved.</string>
-    <string name="set_a_pass_phrase">Set a pass phrase via the option menu first.</string>
+    <string name="filemanager_titleOpen">Open...</string>
+    <string name="filemanager_titleSave">Save As...</string>
+    <string name="filemanager_titleEncrypt">Select File To Encrypt...</string>
+    <string name="filemanager_titleDecrypt">Select File To Decrypt...</string>
+    <string name="filemanager_btnOpen">Open</string>
+    <string name="filemanager_btnSave">Save</string>
+
+    <string name="warning">Warning</string>
+    <string name="error">Error</string>
+    <string name="warningMessage">Warning: %s</string>
+    <string name="errorMessage">Error: %s</string>
+
+    <!-- sentences -->
+    <string name="wrongPassPhrase">Wrong pass phrase.</string>
+    <string name="usingClipboardContent">Using clipboard content.</string>
+    <string name="keySaved">Key saved.</string>
+    <string name="setAPassPhrase">Set a pass phrase via the option menu first.</string>
+    <string name="oiFilemanagerNotInstalled">OI File Manager not installed.</string>
+    <string name="passPhrasesDoNotMatch">The pass phrases didn't match.</string>
+    <string name="passPhraseMustNotBeEmpty">Empty pass phrases are not allowed.</string>
+    <string name="passPhraseForSymmetricEncryption">Pass phrase for symmetric encryption:</string>
+    <string name="passPhraseFor">Pass phrase for %s:</string>
+    <string name="fileDeleteConfirmation">Are you sure you want to delete\n%s?</string>
+    <string name="fileDeleteSuccessful">Successfully deleted.</string>
+    <string name="noFileSelected">Select a file first.</string>
+    <string name="decryptionSuccessful">Successfully decrypted.</string>
+    <string name="encryptionSuccessful">Successfully encrypted.</string>
+    <string name="encryptionToClipboardSuccessful">Successfully encrypted to clipboard.</string>
+    <string name="enterPassPhraseTwice">Enter the pass phrase twice.</string>
+    <string name="selectEncryptionKey">Select at least one encryption key.</string>
+    <string name="selectEncryptionOrSignatureKey">Select at least one encryption key or a signature key.</string>
+    <string name="specifyFileToEncryptTo">Please specify which file to encrypt to.\nWARNING! File will be overwritten if it exists.</string>
+    <string name="specifyFileToDecryptTo">Please specify which file to decrypt to.\nWARNING! File will be overwritten if it exists.</string>
+    <string name="specifyGoogleMailAccount">Specify the Google Mail account you want to add.</string>
+    <string name="specifyFileToImportFrom">Please specify which file to import from.</string>
+    <string name="specifyFileToExportTo">Please specify which file to export to.\nWARNING! File will be overwritten if it exists.</string>
+    <string name="specifyFileToExportSecretKeysTo">Please specify which file to export to.\nWARNING! You are about to export SECRET keys.\nWARNING! File will be overwritten if it exists.</string>
+    <string name="keyDeletionConfirmation">Do you really want to delete the key '%s'?\nYou can't undo this!</string>
+    <string name="secretKeyDeletionConfirmation">Do you really want to delete the SECRET key '%s'?\nYou can't undo this!</string>
+    <string name="keysAddedAndUpdated">Succssfully added %s keys and updated %s keys."</string>
+    <string name="keysAdded">Succssfully added %s keys.</string>
+    <string name="keysUpdated">Succssfully updated %s keys.</string>
+    <string name="noKeysAddedOrUpdated">No keys added or updated.</string>
+    <string name="keyExported">Succssfully exported 1 key.</string>
+    <string name="keysExported">Succssfully exported %s keys.</string>
+    <string name="noKeysExported">No keys exported.</string>
+    <string name="keyCreationElGamalInfo">Note: only subkeys support ElGamal, and for ElGamal the nearest keysize of 1536, 2048, 3072, 4096, or 8192 will be used.</string>
+
+    <!-- error_lowerCase: phrases, no punctuation, all lowercase,
+         they will be put after "errorMessage", e.g. "Error: file not found" -->
+    <string name="error_fileDeleteFailed">deleting '%s' failed</string>
+    <string name="error_fileNotFound">file not found</string>
+    <string name="error_noSecretKeyFound">no suitable secret key found</string>
+    <string name="error_noKnownEncryptionFound">no known kind of encryption found</string>
+    <string name="error_externalStorageNotReady">external storage not ready</string>
+    <string name="error_accountNotFound">account '%s' not found</string>
+    <string name="error_addingAccountFailed">adding account '%s' failed</string>
+    <string name="error_invalidEmail">invalid email '%s'</string>
+    <string name="error_keySizeMinimum512bit">key size must be at least 512bit</string>
+    <string name="error_masterKeyMustNotBeElGamal">the master key cannot be an ElGamal key</string>
+    <string name="error_unknownAlgorithmChoice">unknown algorithm choice</string>
+    <string name="error_userIdNeedsAName">you need to specify a name</string>
+    <string name="error_userIdNeedsAnEmailAddress">you need to specify an email address</string>
+    <string name="error_keyNeedsAUserId">need at least one user id</string>
+    <string name="error_mainUserIdMustNotBeEmpty">main user id must not be empty</string>
+    <string name="error_keyNeedsMasterKey">need at least a master key</string>
+    <string name="error_expiryMustComeAfterCreation">expiry date must come after creation date</string>
+    <string name="error_noEncryptionKeysOrPassPhrase">no encryption key(s) or pass phrase given</string>
+    <string name="error_signatureFailed">signature failed</string>
+    <string name="error_noSignaturePassPhrase">no pass phrase given</string>
+    <string name="error_noSignatureKey">no signature key given</string>
+    <string name="error_invalidData">not valid encryption data</string>
+    <string name="error_corruptData">corrupt data</string>
+    <string name="error_noSymmetricEncryptionPacket">couldn't find a packet with symmetric encryption</string>
+    <string name="error_wrongPassPhrase">wrong pass phrase</string>
+    <string name="error_savingKeys">error saving some key(s)</string>
+
+    <!-- progress_lowerCase: lowercase, phrases, usually ending in '...' -->
+    <string name="progress_done">done.</string>
+    <string name="progress_initializing">initializing...</string>
+    <string name="progress_saving">saving...</string>
+    <string name="progress_importing">importing...</string>
+    <string name="progress_exporting">exporting...</string>
+    <string name="progress_generating">generating key, this can take a while...</string>
+    <string name="progress_buildingKey">building key...</string>
+    <string name="progress_preparingMasterKey">preparing master key...</string>
+    <string name="progress_certifyingMasterKey">certifying master key...</string>
+    <string name="progress_buildingMasterKeyRing">building master key ring...</string>
+    <string name="progress_addingSubKeys">adding sub keys...</string>
+    <string name="progress_savingKeyRing">saving key ring...</string>
+    <string name="progress_importingSecretKeys">importing secret keys...</string>
+    <string name="progress_importingPublicKeys">importing public keys...</string>
+    <string name="progress_reloadingKeys">reloading keys...</string>
+    <string name="progress_exportingKey">exporting key...</string>
+    <string name="progress_exportingKeys">exporting keys...</string>
+    <string name="progress_extractingSignatureKey">extracting signature key...</string>
+    <string name="progress_extractingKey">extracting key...</string>
+    <string name="progress_preparingStreams">preparing streams...</string>
+    <string name="progress_encrypting">encrypting data...</string>
+    <string name="progress_decrypting">decrypting data...</string>
+    <string name="progress_preparingSignature">preparing signature...</string>
+    <string name="progress_generatingSignature">generating signature...</string>
+    <string name="progress_processingSignature">processing signature...</string>
+    <string name="progress_verifyingSignature">verifying signature...</string>
+    <string name="progress_signing">signing...</string>
+    <string name="progress_readingData">reading data...</string>
+    <string name="progress_findingKey">finding key...</string>
+    <string name="progress_decompressingData">decompressing data...</string>
+    <string name="progress_verifyingIntegrity">verifying integrity...</string>
+
 </resources>