diff --git a/res/values/strings.xml b/res/values/strings.xml
index 55f71187e..befedca55 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -3,6 +3,8 @@
     <string name="app_name">K-9 Mail</string>
     <string name="beta_app_name">K-9 Mail BETA</string>
     <string name="app_authors">Google, The K-9 Dog Walkers.</string>
+    <string name="app_copyright_fmt">Copyright 2008-<xliff:g>%s</xliff:g> The K-9 Dog Walkers. Portions Copyright 2006-<xliff:g>%s</xliff:g> the Android Open Source Project.</string>
+    <string name="app_license">Licensed under the Apache License, Version 2.0.</string>
     <string name="app_authors_fmt">Authors: <xliff:g id="app_authors">%s</xliff:g></string>
     <string name="app_revision_url">http://code.google.com/p/k9mail/wiki/ReleaseNotes</string>
     <string name="app_revision_fmt">Revision Information: <xliff:g id="app_revision_url">%s</xliff:g></string>
diff --git a/src/com/fsck/k9/activity/Accounts.java b/src/com/fsck/k9/activity/Accounts.java
index ca8cdbe66..bd0fd14bd 100644
--- a/src/com/fsck/k9/activity/Accounts.java
+++ b/src/com/fsck/k9/activity/Accounts.java
@@ -824,6 +824,7 @@ public class Accounts extends K9ListActivity implements OnItemClickListener, OnC
         String appName = getString(R.string.app_name);
         WebView wv = new WebView(this);
         String html = "<meta http-equiv=\"content-type\" content=\"text/html; charset=utf-8\" />" +
+                      "<img src=\"file:///android_res/drawable/icon.png\" alt=\""+appName+"\" />" +
                       "<h1>" + String.format(getString(R.string.about_title_fmt),
                                              "<a href=\"" + getString(R.string.app_webpage_url) + "\">" + appName + "</a>") + "</h1>" +
                       "<p>" + appName + " " +
@@ -833,7 +834,13 @@ public class Accounts extends K9ListActivity implements OnItemClickListener, OnC
                                             getString(R.string.app_authors)) + "</p>" +
                       "<p>" + String.format(getString(R.string.app_revision_fmt),
                                             "<a href=\"" + getString(R.string.app_revision_url) + "\">" +
-                                            getString(R.string.app_revision_url) + "</a></p>");
+                                            getString(R.string.app_revision_url) + "</a></p>" +
+                      "<hr/><p>" + String.format(getString(R.string.app_copyright_fmt), "2011","2011")+ "</p>" +
+                      "<hr/><p>" + getString(R.string.app_license) + "</p>"
+
+
+
+                                            );
         wv.loadData(html, "text/html", "utf-8");
         new AlertDialog.Builder(this)
         .setView(wv)