diff --git a/res/layout/entry_view.xml b/res/layout/entry_view.xml
index ac094c979..baf366bc4 100644
--- a/res/layout/entry_view.xml
+++ b/res/layout/entry_view.xml
@@ -59,90 +59,8 @@
android:layout_height="fill_parent"
android:layout_above="@id/entry_divider2"
android:layout_below="@id/title_block">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ android:layout_width="wrap_content" />
\ No newline at end of file
diff --git a/res/layout/entry_view_contents.xml b/res/layout/entry_view_contents.xml
new file mode 100644
index 000000000..789436c4e
--- /dev/null
+++ b/res/layout/entry_view_contents.xml
@@ -0,0 +1,105 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/res/layout/entry_view_v4.xml b/res/layout/entry_view_v4.xml
index d1b575798..d0f7c1ae0 100644
--- a/res/layout/entry_view_v4.xml
+++ b/res/layout/entry_view_v4.xml
@@ -48,90 +48,8 @@
android:layout_height="fill_parent"
android:layout_alignParentBottom="true"
android:layout_below="@id/title_block">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ android:layout_width="wrap_content" />
\ No newline at end of file
diff --git a/src/com/keepassdroid/view/EntryContentsView.java b/src/com/keepassdroid/view/EntryContentsView.java
new file mode 100644
index 000000000..eba8cf7f4
--- /dev/null
+++ b/src/com/keepassdroid/view/EntryContentsView.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright 2010 Brian Pellin.
+ *
+ * This file is part of KeePassDroid.
+ *
+ * KeePassDroid is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * KeePassDroid is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with KeePassDroid. If not, see .
+ *
+ */
+package com.keepassdroid.view;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.view.LayoutInflater;
+import android.widget.TableLayout;
+
+import com.android.keepass.R;
+
+public class EntryContentsView extends TableLayout {
+
+ public EntryContentsView(Context context) {
+ super(context);
+
+ inflate(context);
+ }
+
+ public EntryContentsView(Context context, AttributeSet attrs) {
+ super(context, attrs);
+
+ inflate(context);
+ }
+
+ private void inflate(Context context) {
+ LayoutInflater inflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+ inflater.inflate(R.layout.entry_view_contents, this);
+ }
+
+}