diff --git a/res/layout/entry_edit.xml b/res/layout/entry_edit.xml
index 142420fc9..952b2fd65 100644
--- a/res/layout/entry_edit.xml
+++ b/res/layout/entry_edit.xml
@@ -52,7 +52,8 @@
 			  android:layout_width="fill_parent"
 			  android:layout_height="wrap_content"
 			  android:singleLine="true"
-			  android:layout_below="@id/entry_title_label"/>
+			  android:layout_below="@id/entry_title_label"
+			  android:hint="@string/hint_title"/>
 			<!-- Username -->
 			<TextView android:id="@+id/entry_user_name_label"
 			  android:layout_width="wrap_content"
@@ -63,7 +64,8 @@
 			  android:layout_width="fill_parent"
 			  android:layout_height="wrap_content"
 			  android:singleLine="true"
-			  android:layout_below="@id/entry_user_name_label"/>
+			  android:layout_below="@id/entry_user_name_label"
+			  android:hint="@string/hint_username"/>
 			<!--  URL -->
 			<TextView android:id="@+id/entry_url_label"
 			  android:layout_width="wrap_content"
@@ -74,7 +76,8 @@
 			  android:layout_width="fill_parent"
 			  android:layout_height="wrap_content"
 			  android:singleLine="true"
-			  android:layout_below="@id/entry_url_label"/>
+			  android:layout_below="@id/entry_url_label"
+			  android:hint="@string/hint_url"/>
 			<!-- Password -->
 			<TextView android:id="@+id/entry_password_label"
 			  android:layout_width="wrap_content"
@@ -86,7 +89,8 @@
 			  android:layout_height="wrap_content"
 			  android:password="true"
 			  android:singleLine="true"
-			  android:layout_below="@id/entry_password_label"/>
+			  android:layout_below="@id/entry_password_label"
+			  android:hint="@string/hint_pass"/>
 			<!-- Confirm Password -->
 			<TextView android:id="@+id/entry_confpassword_label"
 			  android:layout_width="wrap_content"
@@ -98,7 +102,8 @@
 			  android:layout_height="wrap_content"
 			  android:password="true"
 			  android:singleLine="true"
-			  android:layout_below="@id/entry_confpassword_label"/>
+			  android:layout_below="@id/entry_confpassword_label"
+			  android:hint="@string/hint_conf_pass"/>
 			<!-- Comment -->
 			<TextView android:id="@+id/entry_comment_label"
 			  android:layout_width="wrap_content"
@@ -109,7 +114,8 @@
 		      android:inputType="textMultiLine"
 		      android:layout_width="fill_parent"
 		      android:layout_height="wrap_content"
-			  android:layout_below="@id/entry_comment_label"/>
+			  android:layout_below="@id/entry_comment_label"
+			  android:hint="@string/hint_comment"/>
 		</RelativeLayout>
 	</ScrollView>
 </RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/password.xml b/res/layout/password.xml
index 4ff33158b..81af7322d 100644
--- a/res/layout/password.xml
+++ b/res/layout/password.xml
@@ -42,23 +42,19 @@
 	<TextView android:layout_width="wrap_content"
 	  android:layout_height="wrap_content"
 	  android:text="@string/entry_and_or" />
-	<TextView android:layout_width="wrap_content"
-	  android:layout_height="wrap_content" 
-	  android:text="@string/entry_password" />
 	<EditText android:id="@+id/pass_password" 
 	  android:layout_width="fill_parent"
 	  android:layout_height="wrap_content" 
 	  android:layout_weight="1"
 	  android:password="true"
-	  android:singleLine="true"/>
-	<TextView android:layout_width="wrap_content"
-	  android:layout_height="wrap_content" 
-	  android:text="@string/entry_keyfile" />
+	  android:singleLine="true"
+	  android:hint="@string/entry_password"/>
 	<EditText android:id="@+id/pass_keyfile" 
 	  android:layout_width="fill_parent"
 	  android:layout_height="wrap_content" 
 	  android:layout_weight="1"
-	  android:singleLine="true"/>
+	  android:singleLine="true"
+	  android:hint="@string/entry_keyfile"/>
 	<Button android:id="@+id/pass_ok" 
 	  android:text="@string/pass_ok"
 	  android:layout_width="100sp"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 04e57cd84..a9af22178 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -9,7 +9,7 @@
 <string name="entry_title">Name: </string>
 <string name="entry_user_name">User Name: </string>
 <string name="entry_url">URL: </string>
-<string name="entry_password">Password: </string>
+<string name="entry_password">Password</string>
 <string name="entry_comment">Comments: </string>
 <string name="MaskedPassword">*****</string>
 <string name="menu_show_password">Show Password</string>
@@ -24,7 +24,7 @@
 <string name="menu_lock">Lock Database</string>
 <string name="error_nopass">A password or a keyfile is requried.</string>
 <string name="entry_and_or">Enter a password and/or a key file to unlock your database:</string>
-<string name="entry_keyfile">Key file (optional):</string>
+<string name="entry_keyfile">Key file (optional)</string>
 
 <color name="blue_highlight">#0000dd</color>
 <string name="group">Group</string>
@@ -53,4 +53,10 @@
 <string name="search_label">Search</string>
 <string name="search_hint">Entry title/description</string>
 <string name="no_results">No search results</string>
+<string name="hint_title">name</string>
+<string name="hint_username">username</string>
+<string name="hint_url">url</string>
+<string name="hint_pass">password</string>
+<string name="hint_conf_pass">confirm password</string>
+<string name="hint_comment">comment</string>
 </resources>