diff --git a/AUTHORS b/AUTHORS
index 8e54e9701..ff3d6f9ec 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -37,6 +37,7 @@ Jonas Petersson (Prisjakt)
 Joseph Wain (Google)
 Juho Mikkonen
 jwicks
+kamilkaczm
 Kevin O'Sullivan (SITA)
 Kevin Xue (NetDragon Websoft Inc., China)
 Lachezar Dobrev
diff --git a/android/res/layout/capture.xml b/android/res/layout/capture.xml
index 7d578d652..10e96056c 100755
--- a/android/res/layout/capture.xml
+++ b/android/res/layout/capture.xml
@@ -175,8 +175,7 @@
                     android:textColorLink="@color/result_text"
                     android:textSize="14sp"
                     android:padding="24dip"
-                    android:autoLink="web"
-                    android:clickable="true"/>
+                    android:autoLink="web"/>
 
         </LinearLayout>
 
diff --git a/android/res/values-ar/strings.xml b/android/res/values-ar/strings.xml
index aa22ab8fc..6eea50f88 100644
--- a/android/res/values-ar/strings.xml
+++ b/android/res/values-ar/strings.xml
@@ -74,6 +74,8 @@
   <string name="msg_default_type">النوع</string>
   <string name="msg_encode_barcode_failed">تعذر إنشاء الرمز الشريطي المطلوب.</string>
   <string name="msg_encode_contents_failed">تعذر ترميز رمز شريطي من البيانات المتوفرة.</string>
+  <string name="msg_google_books">كتب جوجل</string>
+  <string name="msg_google_product">بحث جوجل</string>
   <string name="msg_google_shopper_missing">لم يتم تثبيت Google Shopper</string>
   <string name="msg_install_google_shopper">يجمع Google Shopper بين مسح الرمز الشريطي مع الأسعار والتعليقات وغيرها بدون فتح المتصفح. هل تريد استخدامه؟</string>
   <string name="msg_intent_failed">عفوا، تعذر تشغيل التطبيق المطلوب. قد تكون محتويات الرمز الشريطي غير صحيحة.</string>
diff --git a/android/res/values-bg/strings.xml b/android/res/values-bg/strings.xml
index dfc5dc465..7f95c9a3d 100644
--- a/android/res/values-bg/strings.xml
+++ b/android/res/values-bg/strings.xml
@@ -74,6 +74,8 @@
   <string name="msg_default_type">Тип</string>
   <string name="msg_encode_barcode_failed">Неуспешно създаване на желания баркод.</string>
   <string name="msg_encode_contents_failed">Неуспешно кодиране на подадените данни.</string>
+  <string name="msg_google_books">Google Books</string>
+  <string name="msg_google_product">Google Търсене на продукти</string>
   <string name="msg_google_shopper_missing">Гугъл Магазин не е инсталиран</string>
   <string name="msg_install_google_shopper">Гугъл Магазин комбинира сканирането на баркодове с онлайн и локални цени, отзиви и още много неща без да отваряте браузър. Желаете ли да опитате?</string>
   <string name="msg_intent_failed">Съжаляваме, но нужното приложение не успя да се стартира. Възможно е баркода или съдържанието му да са невалидни.</string>
diff --git a/android/res/values-cs/strings.xml b/android/res/values-cs/strings.xml
index 5777024c6..b405315c0 100644
--- a/android/res/values-cs/strings.xml
+++ b/android/res/values-cs/strings.xml
@@ -74,6 +74,8 @@
   <string name="msg_default_type">Typ</string>
   <string name="msg_encode_barcode_failed">Nepodařilo se vytvořit požadovaný čárový kód.</string>
   <string name="msg_encode_contents_failed">Nepodařilo se rozkódovat čárový kód z poskytnutých údajů.</string>
+  <string name="msg_google_books">Google Books</string>
+  <string name="msg_google_product">Google Product Search</string>
   <string name="msg_google_shopper_missing">Google Shopper není nainstalován</string>
   <string name="msg_install_google_shopper">Google Shopper kombinuje technologie čárového kódu s cenami, recenze a více bez otevření prohlížeče. Chtěli byste to zkusit?</string>
   <string name="msg_intent_failed">Litujeme, požadovanou aplikaci nelze spustit. Čárový kód je nefunkční.</string>
diff --git a/android/res/values-da/strings.xml b/android/res/values-da/strings.xml
index c07fde47e..a8494c6ae 100644
--- a/android/res/values-da/strings.xml
+++ b/android/res/values-da/strings.xml
@@ -74,6 +74,8 @@
   <string name="msg_default_type">Type</string>
   <string name="msg_encode_barcode_failed">Kunne ikke generere den ønskede stregkode.</string>
   <string name="msg_encode_contents_failed">Kunne ikke indkode en stregkode fra oplysningerne.</string>
+  <string name="msg_google_books">Google Books</string>
+  <string name="msg_google_product">Google Product Search</string>
   <string name="msg_google_shopper_missing">Google Shopper er ikke installeret</string>
   <string name="msg_install_google_shopper">Google Shopper kombinerer stregkodescanning med priser, anmeldelser og meget mere uden at åbne en browser. Kunne du tænke dig at prøve det?</string>
   <string name="msg_intent_failed">Beklager, den ønskede applikation kunne ikke blive startet. Stregkodeindholdet er måsket ugyldigt.</string>
diff --git a/android/res/values-de/strings.xml b/android/res/values-de/strings.xml
index aadee3206..ab899c3ca 100644
--- a/android/res/values-de/strings.xml
+++ b/android/res/values-de/strings.xml
@@ -74,6 +74,8 @@
   <string name="msg_default_type">Typ</string>
   <string name="msg_encode_barcode_failed">Der gewünschte Barcode kann nicht erzeugt werden.</string>
   <string name="msg_encode_contents_failed">Aus den Daten kann kein Barcode erzeugt werden.</string>
+  <string name="msg_google_books">Google Bücher</string>
+  <string name="msg_google_product">Google Shopping</string>
   <string name="msg_google_shopper_missing">Google Shopper ist nicht installiert</string>
   <string name="msg_install_google_shopper">Google Shopper verbindet ohne Öffnen des Browsers Barcode-Scannen mit Preisen, Testberichten und mehr. Möchten Sie es ausprobieren?</string>
   <string name="msg_intent_failed">Die gewünschte Applikation kann nicht geöffnet werden. Der Barcode könnte ungültig sein.</string>
diff --git a/android/res/values-el/strings.xml b/android/res/values-el/strings.xml
index 48c25441c..a066fa6e6 100644
--- a/android/res/values-el/strings.xml
+++ b/android/res/values-el/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
- Copyright (C) 2010 ZXing authors
+ Copyright (C) 2011 ZXing authors
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
@@ -74,6 +74,8 @@
   <string name="msg_default_type">Τύπος</string>
   <string name="msg_encode_barcode_failed">Σφάλμα στην παραγωγή του barcode.</string>
   <string name="msg_encode_contents_failed">Δεν γίνεται να παραχθεί barcode από τα δεδομένα αυτά.</string>
+  <string name="msg_google_books">Google Books</string>
+  <string name="msg_google_product">Αναζήτηση προϊόντων Google</string>
   <string name="msg_google_shopper_missing">Το Google Shopper is not installedδεν είναι εγκατεστημένο.</string>
   <string name="msg_install_google_shopper">Το Google Shopper συνδυάζει σκανάρισμα barcode με online και τοπικές τιμές, αξιολογήσεις και άλλα χωρίς να ανοίξετε τον browser. Θέλετε να το δοκιμάσετε;</string>
   <string name="msg_intent_failed">Συγνώμη, η ζητούμενη εφαρμογή δεν μπορεί να εκιννηθεί. Τα δεδομληνα του barcode ίσως δεν είναι έγκυρα.</string>
@@ -107,9 +109,9 @@
   <string name="preferences_play_beep_title">Μπιπ</string>
   <string name="preferences_remember_duplicates_summary">Αποθήκευση ολλαπλών σκαναρισμάτων του ίδιου barcode στο ιστορικό</string>
   <string name="preferences_remember_duplicates_title">Απομνημόνευση διπλών</string>
+  <string name="preferences_result_title">Ρυθμίσεις αποτελεσμάτων</string>
   <string name="preferences_reverse_image_summary">Ενεργοποιήστε σε συσκευές με μόνο μπροστινή κάμερα</string>
   <string name="preferences_reverse_image_title">Ανάποδη εικόνα κάμερας</string>
-  <string name="preferences_result_title">Ρυθμίσεις αποτελεσμάτων</string>
   <string name="preferences_scanning_title">Όταν σκανάρεις barcodes, ψάχνε για\u2026</string>
   <string name="preferences_supplemental_summary">Προσπάθησε να βρείς περισσότερες πληροφορίες για τα περιεχόμενα του barcode</string>
   <string name="preferences_supplemental_title">Ψάχνε επιπλέον πληροφορίες</string>
@@ -130,13 +132,13 @@
   <string name="title_about">Barcode Scanner v</string>
   <string name="wa_name">Σύνδεση WLAN</string>
   <string name="wifi_changing_network">Αλλαγή Δικτύου</string>
+  <string name="wifi_connect_failed">Σφάλμα στην σύνδεση Δικτύου</string>
   <string name="wifi_connected">Συνδέθηκε</string>
   <string name="wifi_creating_network">Δημιουργία Δικτύου</string>
   <string name="wifi_modifying_network">Επεξεργασία Δικτύου</string>
+  <string name="wifi_ssid_label">Όνομα Δικτύου</string>
   <string name="wifi_ssid_missing">Λείπει όνομα Δικτύου</string>
   <string name="wifi_type_incorrect">Λάθος τύπος Δικτύου</string>
-  <string name="wifi_connect_failed">Σφάλμα στην σύνδεση Δικτύου</string>
-  <string name="wifi_ssid_label">Όνομα Δικτύου</string>
   <string name="wifi_type_label">Τύπος</string>
   <string name="zxing_url">http://code.google.com/p/zxing</string>
 </resources>
diff --git a/android/res/values-es/strings.xml b/android/res/values-es/strings.xml
index ab2d27ca1..78f367615 100644
--- a/android/res/values-es/strings.xml
+++ b/android/res/values-es/strings.xml
@@ -74,6 +74,8 @@
   <string name="msg_default_type">Tipo</string>
   <string name="msg_encode_barcode_failed">No se pudo generar el código de barras solicitado.</string>
   <string name="msg_encode_contents_failed">No puede codificar un código de barras con estos datos.</string>
+  <string name="msg_google_books">Google Libros</string>
+  <string name="msg_google_product">Google Shopping</string>
   <string name="msg_google_shopper_missing">Google Shopper no está instalado</string>
   <string name="msg_install_google_shopper">Google Shopper combina escaneo de código de barras con los precios, comentarios y mucho más sin necesidad de abrir el navegador. ¿Le gustaría probarlo?</string>
   <string name="msg_intent_failed">Lo sentimos, la aplicación solicitada no pudo ser lanzada. El contenido de código de barras puede ser inválida.</string>
diff --git a/android/res/values-fi/strings.xml b/android/res/values-fi/strings.xml
index a56c1c3d3..56994f6ea 100644
--- a/android/res/values-fi/strings.xml
+++ b/android/res/values-fi/strings.xml
@@ -74,6 +74,8 @@
   <string name="msg_default_type">Tyypi</string>
   <string name="msg_encode_barcode_failed">Ei voinut generoida pyydettyä viivakoodia.</string>
   <string name="msg_encode_contents_failed">Ei voinut purkaa viivakoodin sisältöä.</string>
+  <string name="msg_google_books">Google Books</string>
+  <string name="msg_google_product">Google Product Search</string>
   <string name="msg_google_shopper_missing">Google Shopper ei ole asennettu</string>
   <string name="msg_install_google_shopper">Google Shopper yhdistää viivakoodi skannauksen hintoihin, arvostelut ja avaamatta selainta. Haluatko kokeilla sitä?</string>
   <string name="msg_intent_failed">Anteeksi, pyydettyä ohjelmaa ei voi käynnistää. Viivakoodin sisältö on voinut vahingoittua.</string>
diff --git a/android/res/values-fr/strings.xml b/android/res/values-fr/strings.xml
index 7e5e5f968..4f81b36d0 100644
--- a/android/res/values-fr/strings.xml
+++ b/android/res/values-fr/strings.xml
@@ -74,6 +74,8 @@
   <string name="msg_default_type">Type</string>
   <string name="msg_encode_barcode_failed">Impossible de générer le code-barres demandé.</string>
   <string name="msg_encode_contents_failed">Impossible de créer le code-barres à partir des données fournies.</string>
+  <string name="msg_google_books">Google Livres</string>
+  <string name="msg_google_product">Google Shopping</string>
   <string name="msg_google_shopper_missing">Google Shopper n\'est pas installé</string>
   <string name="msg_install_google_shopper">Google Shopper associe la lecture de codes-barres avec des prix, des commentaires et plus encore sans ouvrir le navigateur. Désirez-vous l\'essayer maintenant ?</string>
   <string name="msg_intent_failed">Désolé, l\'application demandée n\'a pas pu être lancée. Le contenu du code-barres est peut-être invalide.</string>
diff --git a/android/res/values-he/strings.xml b/android/res/values-he/strings.xml
index 7325eee9e..b41bec3d9 100755
--- a/android/res/values-he/strings.xml
+++ b/android/res/values-he/strings.xml
@@ -74,6 +74,8 @@
   <string name="msg_default_type">סוג</string>
   <string name="msg_encode_barcode_failed">לא ניתן ליצור את הברקוד המבוקש.</string>
   <string name="msg_encode_contents_failed">לא היתה אפשרות לקודד ברקוד מהנתונים שסופקו.</string>
+  <string name="msg_google_books">Google Books</string>
+  <string name="msg_google_product">Google Product Search</string>
   <string name="msg_google_shopper_missing">Google Shopper לא מותקן.</string>
   <string name="msg_install_google_shopper">Google Shopper משלבת סריקת ברקודים עם מחירים מקוונים, חוות דעת ועוד בלי לפתוח את הדפדפן. האם ברצונך לנסות זאת?</string>
   <string name="msg_intent_failed">סליחה, לא ניתן להפעיל את היישום המבוקש. ייתכן שתוכן הברקוד לא תקין.</string>
diff --git a/android/res/values-hu/strings.xml b/android/res/values-hu/strings.xml
index b4b2dc7e0..80b1e8fba 100644
--- a/android/res/values-hu/strings.xml
+++ b/android/res/values-hu/strings.xml
@@ -74,6 +74,8 @@
   <string name="msg_default_type">Típus</string>
   <string name="msg_encode_barcode_failed">Nem lehetett legenerálni a kért vonalkódot.</string>
   <string name="msg_encode_contents_failed">Nem lehetett lekódolni a vonalkódot a megadott tartalomból.</string>
+  <string name="msg_google_books">Google Könyvek</string>
+  <string name="msg_google_product">Google Product Search</string>
   <string name="msg_google_shopper_missing">A Google Shopper nincs telepítve</string>
   <string name="msg_install_google_shopper">A Google Shopper kombinálja a vonalkód szkennelést árakkal, értékelésekkel és más dolgokkal, böngésző megnyitása nélkül. Ki szeretné próbálni?</string>
   <string name="msg_intent_failed">Elnézést, a kért alkalmazást nem lehet elindítani. A vonalkód tartalma lehet, hogy érvénytelen.</string>
diff --git a/android/res/values-id/strings.xml b/android/res/values-id/strings.xml
index a3d4f3f4e..6aa33f05a 100644
--- a/android/res/values-id/strings.xml
+++ b/android/res/values-id/strings.xml
@@ -74,6 +74,8 @@
   <string name="msg_default_type">Tipe</string>
   <string name="msg_encode_barcode_failed">Tidak dapat menghasilkan barcode yang diminta.</string>
   <string name="msg_encode_contents_failed">Tidak dapat meng-encode barcode dari data yang diberikan.</string>
+  <string name="msg_google_books">Google Books</string>
+  <string name="msg_google_product">Google Product Search</string>
   <string name="msg_google_shopper_missing">Google Shopper belum dipasang</string>
   <string name="msg_install_google_shopper">Google Shopper menggabungkan hasil pemindaian barcode dengan harga online dan lokal, tinjauan dan lain sebagainya tanpa harus membuka browser. Apakah Anda akan mencobanya?</string>
   <string name="msg_intent_failed">Maaf, aplikasi yang diminta tidak dapat dijalankan. Mungkin ada kesalahan isi barcode.</string>
@@ -107,9 +109,9 @@
   <string name="preferences_play_beep_title">Beep</string>
   <string name="preferences_remember_duplicates_summary">Simpan beberapa pindaian dari barcode yang sama di dalam Riwayat</string>
   <string name="preferences_remember_duplicates_title">Ingat duplikasi</string>
+  <string name="preferences_result_title">Hasil pengaturan</string>
   <string name="preferences_reverse_image_summary">Aktifkan perangkat hanya dengan kamera depan</string>
   <string name="preferences_reverse_image_title">Gambar kamera terbalik</string>
-  <string name="preferences_result_title">Hasil pengaturan</string>
   <string name="preferences_scanning_title">Ketika memindai barcode, decode\u2026</string>
   <string name="preferences_supplemental_summary">Mencoba mendapatkan beberapa informasi mengenai isi barcode</string>
   <string name="preferences_supplemental_title">Ambil informasi lebih lanjut</string>
@@ -130,13 +132,13 @@
   <string name="title_about">Barcode Scanner v</string>
   <string name="wa_name">Koneksi WLAN</string>
   <string name="wifi_changing_network">Ubah Koneksi</string>
+  <string name="wifi_connect_failed">Koneksi ke jaringan gagal</string>
   <string name="wifi_connected">Terhubung</string>
   <string name="wifi_creating_network">Buat Koneksi</string>
   <string name="wifi_modifying_network">Perbarui Jaringan</string>
+  <string name="wifi_ssid_label">Nama Jaringan</string>
   <string name="wifi_ssid_missing">Nama jaringan hilang</string>
   <string name="wifi_type_incorrect">Jenis jaringan salah</string>
-  <string name="wifi_connect_failed">Koneksi ke jaringan gagal</string>
-  <string name="wifi_ssid_label">Nama Jaringan</string>
   <string name="wifi_type_label">Tipe</string>
   <string name="zxing_url">http://code.google.com/p/zxing</string>
 </resources>
diff --git a/android/res/values-it/strings.xml b/android/res/values-it/strings.xml
index 50bfd50ed..5189da912 100644
--- a/android/res/values-it/strings.xml
+++ b/android/res/values-it/strings.xml
@@ -74,6 +74,8 @@
   <string name="msg_default_type">Tipo</string>
   <string name="msg_encode_barcode_failed">Impossibile generare il codice a barre richiesto.</string>
   <string name="msg_encode_contents_failed">Impossibile codificare un codice a barre dai dati forniti.</string>
+  <string name="msg_google_books">Google Libri</string>
+  <string name="msg_google_product">Google Shopping</string>
   <string name="msg_google_shopper_missing">Google Shopper non è installato</string>
   <string name="msg_install_google_shopper">Google Shopper combina la scansione dei codici a barre con prezzi locali e online, recensioni e altro senza dover aprire il browser. Vuoi provare?</string>
   <string name="msg_intent_failed">Spiacenti, l\'applicazione richiesta non può essere avviata. Il contenuto del codice a barre può essere non valido.</string>
diff --git a/android/res/values-iw/strings.xml b/android/res/values-iw/strings.xml
index 7325eee9e..b41bec3d9 100644
--- a/android/res/values-iw/strings.xml
+++ b/android/res/values-iw/strings.xml
@@ -74,6 +74,8 @@
   <string name="msg_default_type">סוג</string>
   <string name="msg_encode_barcode_failed">לא ניתן ליצור את הברקוד המבוקש.</string>
   <string name="msg_encode_contents_failed">לא היתה אפשרות לקודד ברקוד מהנתונים שסופקו.</string>
+  <string name="msg_google_books">Google Books</string>
+  <string name="msg_google_product">Google Product Search</string>
   <string name="msg_google_shopper_missing">Google Shopper לא מותקן.</string>
   <string name="msg_install_google_shopper">Google Shopper משלבת סריקת ברקודים עם מחירים מקוונים, חוות דעת ועוד בלי לפתוח את הדפדפן. האם ברצונך לנסות זאת?</string>
   <string name="msg_intent_failed">סליחה, לא ניתן להפעיל את היישום המבוקש. ייתכן שתוכן הברקוד לא תקין.</string>
diff --git a/android/res/values-ja-rJP/strings.xml b/android/res/values-ja-rJP/strings.xml
index 54adbfa1e..4c7eb1d24 100644
--- a/android/res/values-ja-rJP/strings.xml
+++ b/android/res/values-ja-rJP/strings.xml
@@ -74,6 +74,8 @@
   <string name="msg_default_type">タイプ</string>
   <string name="msg_encode_barcode_failed">バーコードを作成できませんでした。</string>
   <string name="msg_encode_contents_failed">このデータからバーコードを作成できませんでした。</string>
+  <string name="msg_google_books">Google書籍</string>
+  <string name="msg_google_product">Googleショッピング</string>
   <string name="msg_google_shopper_missing">Google ショッパーがインストールされていません</string>
   <string name="msg_install_google_shopper">Google ショッパーは、ブラウザを使わなくても、価格やレビューなどを見ることができます。試しますか？</string>
   <string name="msg_intent_failed">指定されたアプリケーションを起動できませんでした。バーコードの内容が無効である可能性があります。</string>
diff --git a/android/res/values-kr/strings.xml b/android/res/values-kr/strings.xml
index c5e5ca2c3..9025503b9 100644
--- a/android/res/values-kr/strings.xml
+++ b/android/res/values-kr/strings.xml
@@ -74,6 +74,8 @@
   <string name="msg_default_type">종류</string>
   <string name="msg_encode_barcode_failed">요청된 바코드를 만들지 못하였습니다.</string>
   <string name="msg_encode_contents_failed">주어진 데이터로 바코드를 만들지 못하였습니다.</string>
+  <string name="msg_google_books">Google 도서</string>
+  <string name="msg_google_product">Google 상품 검색</string>
   <string name="msg_google_shopper_missing">Google Shopper가 설치되어 있지 않습니다.</string>
   <string name="msg_install_google_shopper">Google Shopper는 바코드 스캐닝을 이용하여 인터넷을 열지 않고 가격, 리뷰 등을 열람하는 기능을 제공합니다. 사용해 보시겠습니까?</string>
   <string name="msg_intent_failed">죄송합니다. 어플리케이션이 실행되지 않습니다. 바코드 내용이 잘못 되었을 수도 있습니다.</string>
diff --git a/android/res/values-nl/strings.xml b/android/res/values-nl/strings.xml
index 12be77cd3..92acb5ff3 100644
--- a/android/res/values-nl/strings.xml
+++ b/android/res/values-nl/strings.xml
@@ -74,6 +74,8 @@
   <string name="msg_default_type">Type</string>
   <string name="msg_encode_barcode_failed">Kan de gevraagde barcode niet genereren.</string>
   <string name="msg_encode_contents_failed">Kan geen barcode van de gegeven data maken.</string>
+  <string name="msg_google_books">Google Boeken</string>
+  <string name="msg_google_product">Google Shopping</string>
   <string name="msg_google_shopper_missing">Google Shopper is niet geinstalleerd</string>
   <string name="msg_install_google_shopper">Google Shopper combineert barcode scannen met prijzen, reviews en nog veel meer zonder het openen van de browser. Wilt u het proberen?</string>
   <string name="msg_intent_failed">Sorry, de gevraagde applicatie kan niet gestart worden. De barcode kan verkeerd zijn.</string>
diff --git a/android/res/values-pl/strings.xml b/android/res/values-pl/strings.xml
index 3ff815500..9ec12fe74 100644
--- a/android/res/values-pl/strings.xml
+++ b/android/res/values-pl/strings.xml
@@ -74,6 +74,8 @@
   <string name="msg_default_type">Typ</string>
   <string name="msg_encode_barcode_failed">Nie można wygenerować żądanego kodu paskowego.</string>
   <string name="msg_encode_contents_failed">Nie można zakodować kodu paskowego z dostarczonych danych.</string>
+  <string name="msg_google_books">Google Książki</string>
+  <string name="msg_google_product">Wyszukiwarka produktów Google</string>
   <string name="msg_google_shopper_missing">Google Shopper nie jest zainstalowany</string>
   <string name="msg_install_google_shopper">Google Shopper łączy skanowanie kodów paskowych z cenami, recenzjami, itp bez otwierania przeglądarki. Czy chciał/a byś go wypróbować?</string>
   <string name="msg_intent_failed">Przepraszamy, żadana aplikacja nie może zostać uruchomiona. Zawartość kodu paskowego może być nieprawidłowa.</string>
diff --git a/android/res/values-pt/strings.xml b/android/res/values-pt/strings.xml
index 9e685890e..df7f73225 100644
--- a/android/res/values-pt/strings.xml
+++ b/android/res/values-pt/strings.xml
@@ -74,6 +74,8 @@
   <string name="msg_default_type">Tipo</string>
   <string name="msg_encode_barcode_failed">Não foi possível criar código de barras pedido.</string>
   <string name="msg_encode_contents_failed">Não foi possível codificar código de barras dos dados fornecidos.</string>
+  <string name="msg_google_books">Google Livros</string>
+  <string name="msg_google_product">Google Product Search</string>
   <string name="msg_google_shopper_missing">Google Shopper não está instalado.</string>
   <string name="msg_install_google_shopper">Google Shopper combina escaneamento de código de barras com os preços, opiniões e muito mais sem precisar abrir o navegador. Você gostaria de experimentar?</string>
   <string name="msg_intent_failed">Lamentamos, não foi possível iniciar a aplicação pedida. Conteúdos do código de barras inválidos..</string>
diff --git a/android/res/values-ru/strings.xml b/android/res/values-ru/strings.xml
index 3af1bef9b..77cc155f9 100644
--- a/android/res/values-ru/strings.xml
+++ b/android/res/values-ru/strings.xml
@@ -74,6 +74,8 @@
   <string name="msg_default_type">Тип</string>
   <string name="msg_encode_barcode_failed">Не получилось сгенерировать запрошенный штрих-код.</string>
   <string name="msg_encode_contents_failed">Невозможно создать штрих-код из текущих данных.</string>
+  <string name="msg_google_books">Google Books</string>
+  <string name="msg_google_product">Google Product Search</string>
   <string name="msg_google_shopper_missing">Проложение "Google Shopper" не установлено</string>
   <string name="msg_install_google_shopper">Приложение "Google Shopper" объединяет сканирование штрих-кодов с online-поиском товаров, цен, отзывов и т.д., не открывая браузер. Хотите попробовать?</string>
   <string name="msg_intent_failed">К сожалению, запрошенное приложение не может быть запущенно. Возможно, содержимое штрих-кода повреждено.</string>
diff --git a/android/res/values-sk/strings.xml b/android/res/values-sk/strings.xml
index 56fb9df02..2c910497e 100644
--- a/android/res/values-sk/strings.xml
+++ b/android/res/values-sk/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
- Copyright (C) 2010 ZXing authors
+ Copyright (C) 2011 ZXing authors
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
@@ -74,6 +74,8 @@
   <string name="msg_default_type">Typ</string>
   <string name="msg_encode_barcode_failed">Nie je možné vygenerovať požadovaný čiarový kód.</string>
   <string name="msg_encode_contents_failed">Nie je možné zakódovať čiarový kód z poskytnutých údajov.</string>
+  <string name="msg_google_books">Google Books</string>
+  <string name="msg_google_product">Google Product Search</string>
   <string name="msg_google_shopper_missing">Nie je nainštalovaný Google Shopper.</string>
   <string name="msg_install_google_shopper">Google Shopper kombinuje v sebe skenovanie čiarových kódov s miestnymi cenami on-line, recenzie a oveľa viac bez otvorenia prehliadača. Chceli by ste ho vyskúšať?</string>
   <string name="msg_intent_failed">Ospravedlňujeme sa, požadovanú aplikáciu nemohla byť spustená. Obsah čiarového kódu je možno neplatný.</string>
diff --git a/android/res/values-sl/strings.xml b/android/res/values-sl/strings.xml
index aeddc4a77..345476f1c 100644
--- a/android/res/values-sl/strings.xml
+++ b/android/res/values-sl/strings.xml
@@ -74,6 +74,8 @@
   <string name="msg_default_type">Tip</string>
   <string name="msg_encode_barcode_failed">Ni bilo mogoče generirati željene črtne kode</string>
   <string name="msg_encode_contents_failed">Ni bilo mogoče narediti črtne kode iz podanih podatkov</string>
+  <string name="msg_google_books">Google Books</string>
+  <string name="msg_google_product">Google Product Search</string>
   <string name="msg_google_shopper_missing">Google Shopper ni nameščen</string>
   <string name="msg_install_google_shopper">Google Shopper kombinira branje črtnih kod s cenami lokalnih ter spletnih trgovin, ocenami izdelkov in več brez odpiranja spletnega brskalnika. Ga želite preizkusiti?</string>
   <string name="msg_intent_failed">Oprostite, zahtevana aplikacija se ne more zagnati. Lahko da gre za napačno vsebino črtne kode.</string>
diff --git a/android/res/values-sv/strings.xml b/android/res/values-sv/strings.xml
index 9bfd2bd55..50ddc53f1 100644
--- a/android/res/values-sv/strings.xml
+++ b/android/res/values-sv/strings.xml
@@ -74,6 +74,8 @@
   <string name="msg_default_type">Typ</string>
   <string name="msg_encode_barcode_failed">Misslyckades med att skapa den önskade streckkoden.</string>
   <string name="msg_encode_contents_failed">Kunde inte skape en streckkod från de givna uppgifterna.</string>
+  <string name="msg_google_books">Google Books</string>
+  <string name="msg_google_product">Google Product Search</string>
   <string name="msg_google_shopper_missing">Google Shopper är inte installerat</string>
   <string name="msg_install_google_shopper">Google Shopper kombinerar barcode scanning med priser, recensioner och mer utan att öppna webbläsaren. Vill du prova det?</string>
   <string name="msg_intent_failed">Tyvärr, den önskade applikationen kunde inte startas. Streckkodens innehåll kanske är ogiltigt.</string>
diff --git a/android/res/values-tr/strings.xml b/android/res/values-tr/strings.xml
index 8fbbffacf..18d1828d0 100644
--- a/android/res/values-tr/strings.xml
+++ b/android/res/values-tr/strings.xml
@@ -74,6 +74,8 @@
   <string name="msg_default_type">Tür</string>
   <string name="msg_encode_barcode_failed">İstenen barkod oluşturulamadı.</string>
   <string name="msg_encode_contents_failed">Sağlanan verilerden bir barkod kodlanamadı.</string>
+  <string name="msg_google_books">Google Kitap Arama</string>
+  <string name="msg_google_product">Google Ürün Arama</string>
   <string name="msg_google_shopper_missing">Google Shopper yüklü değil</string>
   <string name="msg_install_google_shopper">Google Shopper, tarayıcıyı açmanıza gerek kalmadan barkod taraması, çevrimiçi ve yerel fiyatlar ile gözden geçirme ve diğer özellikten yararlanmanızı sağlar. Denemek ister misiniz?</string>
   <string name="msg_intent_failed">Üzgünüz, istenen uygulama başlatılamadı. Barkod içeriği geçersiz olabilir.</string>
diff --git a/android/res/values-zh-rCN/strings.xml b/android/res/values-zh-rCN/strings.xml
index 8e70208a8..649373166 100644
--- a/android/res/values-zh-rCN/strings.xml
+++ b/android/res/values-zh-rCN/strings.xml
@@ -74,6 +74,8 @@
   <string name="msg_default_type">类型</string>
   <string name="msg_encode_barcode_failed">无法生成条码。</string>
   <string name="msg_encode_contents_failed">无法根据已有数据生成条码。   </string>
+  <string name="msg_google_books">谷歌图书</string>
+  <string name="msg_google_product">谷歌购物</string>
   <string name="msg_google_shopper_missing">谷歌购物未安装</string>
   <string name="msg_install_google_shopper">谷歌购物是一款将条码扫描和商品比价相结合的应用，谷歌购物不使用浏览器，您想尝试吗？</string>
   <string name="msg_intent_failed">抱歉，无法打开所需软件。 条码内容可能无效。</string>
diff --git a/android/res/values-zh-rTW/strings.xml b/android/res/values-zh-rTW/strings.xml
index 14ccbca4e..44c9b67ac 100644
--- a/android/res/values-zh-rTW/strings.xml
+++ b/android/res/values-zh-rTW/strings.xml
@@ -74,6 +74,8 @@
   <string name="msg_default_type">類型</string>
   <string name="msg_encode_barcode_failed">找不到條碼。</string>
   <string name="msg_encode_contents_failed">無法讀取條碼。   </string>
+  <string name="msg_google_books">谷歌圖書</string>
+  <string name="msg_google_product">谷歌產品搜索</string>
   <string name="msg_google_shopper_missing">未安裝谷歌購物</string>
   <string name="msg_install_google_shopper">谷歌購物結合條碼掃描價格，評論，更無需打開瀏覽器。您想試用嗎？</string>
   <string name="msg_intent_failed">抱歉，無法打開所需軟體。 條碼內容可能無效。</string>
diff --git a/android/res/values/strings.xml b/android/res/values/strings.xml
index 6324df7f1..62de5289f 100755
--- a/android/res/values/strings.xml
+++ b/android/res/values/strings.xml
@@ -74,6 +74,8 @@
   <string name="msg_default_type">Type</string>
   <string name="msg_encode_barcode_failed">Could not generate the requested barcode.</string>
   <string name="msg_encode_contents_failed">Could not encode a barcode from the data provided.</string>
+  <string name="msg_google_books">Google Books</string>
+  <string name="msg_google_product">Google Product Search</string>
   <string name="msg_google_shopper_missing">Google Shopper is not installed</string>
   <string name="msg_install_google_shopper">Google Shopper combines barcode scanning with online and local prices, reviews and more without opening the browser. Would you like to try it?</string>
   <string name="msg_intent_failed">Sorry, the requested application could not be launched. The barcode contents may be invalid.</string>
diff --git a/android/src/com/google/zxing/client/android/result/supplement/BookResultInfoRetriever.java b/android/src/com/google/zxing/client/android/result/supplement/BookResultInfoRetriever.java
new file mode 100644
index 000000000..4c65fa090
--- /dev/null
+++ b/android/src/com/google/zxing/client/android/result/supplement/BookResultInfoRetriever.java
@@ -0,0 +1,126 @@
+/*
+ * Copyright 2011 ZXing authors
+ *
+ * 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.
+ */
+
+package com.google.zxing.client.android.result.supplement;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collection;
+
+import android.content.Context;
+import android.widget.TextView;
+import com.google.zxing.client.android.LocaleManager;
+import com.google.zxing.client.android.R;
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.json.JSONTokener;
+
+import android.os.Handler;
+
+import com.google.zxing.client.android.history.HistoryManager;
+
+/**
+ * @author kamilkaczm
+ * @author Sean Owen
+ */
+public final class BookResultInfoRetriever extends SupplementalInfoRetriever {
+
+  private static final String BASE_BOOK_URI =
+      "http://www.google." + LocaleManager.getBookSearchCountryTLD() + "/search?tbm=bks&source=zxing&q=";
+
+  private final String isbn;
+  private final String source;
+  
+  BookResultInfoRetriever(TextView textView,
+                          String isbn,
+                          Handler handler,
+                          HistoryManager historyManager,
+                          Context context) {
+    super(textView, handler, historyManager);
+    this.isbn = isbn;
+    this.source = context.getString(R.string.msg_google_books);
+  }
+
+  @Override
+  void retrieveSupplementalInfo() throws IOException, InterruptedException {
+
+    String contents = downloadViaHttp("https://www.googleapis.com/books/v1/volumes?q=isbn:" + isbn);
+
+    if (contents.length() == 0) {
+      return;
+    }
+
+    String title;
+    String pages;
+    Collection<String> authors;
+
+    try {
+
+      JSONObject topLevel = (JSONObject) new JSONTokener(contents).nextValue();
+      JSONArray items = topLevel.optJSONArray("items");
+      if (items == null || items.isNull(0)) {
+        return;
+      }
+
+      JSONObject volumeInfo = ((JSONObject) items.get(0)).getJSONObject("volumeInfo");
+      if (volumeInfo == null) {
+        return;
+      }
+
+      title = volumeInfo.optString("title");
+      pages = volumeInfo.optString("pageCount");
+
+      authors = new ArrayList<String>();
+      JSONArray authorsArray = volumeInfo.optJSONArray("authors");
+      if (authorsArray != null && !authorsArray.isNull(0)) {
+        for (int i = 0; i < authorsArray.length(); i++) {
+          authors.add(authorsArray.getString(i));
+        }
+      }
+
+    } catch (JSONException e) {
+      throw new IOException(e.toString());
+    }
+
+    Collection<String> newTexts = new ArrayList<String>();
+
+    if (title != null && title.length() > 0) {
+      newTexts.add(title);
+    }
+
+    if (authors != null && !authors.isEmpty()) {
+      boolean first = true;
+      StringBuilder authorsText = new StringBuilder();
+      for (String author : authors) {
+        if (first) {
+          first = false;
+        } else {
+          authorsText.append(", ");
+        }
+        authorsText.append(author);
+      }
+      newTexts.add(authorsText.toString());
+    }
+
+    if (pages != null && pages.length() > 0) {
+      newTexts.add(pages + "pp.");
+    }
+
+    append(isbn, source, newTexts.toArray(new String[newTexts.size()]), BASE_BOOK_URI + isbn);
+  }
+
+}
diff --git a/android/src/com/google/zxing/client/android/result/supplement/ProductResultInfoRetriever.java b/android/src/com/google/zxing/client/android/result/supplement/ProductResultInfoRetriever.java
index 8756ab37e..5361f6c53 100644
--- a/android/src/com/google/zxing/client/android/result/supplement/ProductResultInfoRetriever.java
+++ b/android/src/com/google/zxing/client/android/result/supplement/ProductResultInfoRetriever.java
@@ -18,28 +18,18 @@ package com.google.zxing.client.android.result.supplement;
 
 import android.content.Context;
 import android.os.Handler;
-import android.util.Log;
 import android.widget.TextView;
+import com.google.zxing.client.android.R;
 import com.google.zxing.client.android.history.HistoryManager;
-import com.google.zxing.client.android.AndroidHttpClient;
 import com.google.zxing.client.android.LocaleManager;
-import org.apache.http.HttpEntity;
-import org.apache.http.HttpResponse;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.client.methods.HttpUriRequest;
 
-import java.io.ByteArrayOutputStream;
 import java.io.IOException;
-import java.io.InputStream;
-import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 final class ProductResultInfoRetriever extends SupplementalInfoRetriever {
 
-  private static final String TAG = ProductResultInfoRetriever.class.getSimpleName();
-
   private static final String BASE_PRODUCT_URI =
       "http://www.google." + LocaleManager.getProductSearchCountryTLD() +
           "/m/products?ie=utf8&oe=utf8&scoring=p&source=zxing&q=";
@@ -48,14 +38,16 @@ final class ProductResultInfoRetriever extends SupplementalInfoRetriever {
 
 
   private final String productID;
+  private final String source;
 
   ProductResultInfoRetriever(TextView textView,
                              String productID,
                              Handler handler,
                              HistoryManager historyManager,
                              Context context) {
-    super(textView, handler, historyManager, context);
+    super(textView, handler, historyManager);
     this.productID = productID;
+    this.source = context.getString(R.string.msg_google_product);
   }
 
   @Override
@@ -63,52 +55,11 @@ final class ProductResultInfoRetriever extends SupplementalInfoRetriever {
 
     String encodedProductID = URLEncoder.encode(productID, "UTF-8");
     String uri = BASE_PRODUCT_URI + encodedProductID;
+    String content = downloadViaHttp(uri);
 
-    HttpUriRequest head = new HttpGet(uri);
-    AndroidHttpClient client = AndroidHttpClient.newInstance(null);
-    HttpResponse response = client.execute(head);
-    int status = response.getStatusLine().getStatusCode();
-    if (status != 200) {
-      return;
-    }
-
-    String content = consume(response.getEntity());
     Matcher matcher = PRODUCT_NAME_PRICE_PATTERN.matcher(content);
     if (matcher.find()) {
-      String details = matcher.group(1) + ' ' + matcher.group(2);
-      append(productID, details);
-    }
-    setLink(uri);
-  }
-
-  private static String consume(HttpEntity entity) {
-    Log.d(TAG, "Consuming entity");
-    ByteArrayOutputStream out = new ByteArrayOutputStream();
-    InputStream in = null;
-    try {
-      in = entity.getContent();
-      byte[] buffer = new byte[1024];
-      int bytesRead;
-      while ((bytesRead = in.read(buffer)) > 0) {
-        out.write(buffer, 0, bytesRead);
-      }
-    } catch (IOException ioe) {
-      Log.w(TAG, ioe);
-      // continue
-    } finally {
-      if (in != null) {
-        try {
-          in.close();
-        } catch (IOException ioe) {
-          // continue
-        }
-      }
-    }
-    try {
-      return new String(out.toByteArray(), "UTF-8");
-    } catch (UnsupportedEncodingException uee) {
-      // can't happen
-      throw new IllegalStateException(uee);
+      append(productID, source, new String[] { matcher.group(1), matcher.group(2) }, uri);
     }
   }
 
diff --git a/android/src/com/google/zxing/client/android/result/supplement/SupplementalInfoRetriever.java b/android/src/com/google/zxing/client/android/result/supplement/SupplementalInfoRetriever.java
index 4b63cb9fe..d2088df24 100644
--- a/android/src/com/google/zxing/client/android/result/supplement/SupplementalInfoRetriever.java
+++ b/android/src/com/google/zxing/client/android/result/supplement/SupplementalInfoRetriever.java
@@ -17,20 +17,31 @@
 package com.google.zxing.client.android.result.supplement;
 
 import android.content.Context;
-import android.content.Intent;
-import android.net.Uri;
 import android.os.Handler;
-import android.text.Html;
-import android.view.View;
+import android.text.Spannable;
+import android.text.SpannableString;
+import android.text.Spanned;
+import android.text.method.LinkMovementMethod;
+import android.text.style.URLSpan;
 import android.widget.TextView;
+import com.google.zxing.client.android.AndroidHttpClient;
 import com.google.zxing.client.result.ISBNParsedResult;
 import com.google.zxing.client.result.ParsedResult;
 import com.google.zxing.client.result.ProductParsedResult;
 import com.google.zxing.client.result.URIParsedResult;
 import com.google.zxing.client.android.history.HistoryManager;
+import org.apache.http.HttpEntity;
+import org.apache.http.HttpResponse;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.methods.HttpUriRequest;
 
+import java.io.ByteArrayOutputStream;
 import java.io.IOException;
+import java.io.InputStream;
+import java.io.UnsupportedEncodingException;
 import java.lang.ref.WeakReference;
+import java.util.ArrayList;
+import java.util.Collection;
 import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
@@ -60,23 +71,21 @@ public abstract class SupplementalInfoRetriever implements Callable<Void> {
                                           Handler handler,
                                           HistoryManager historyManager,
                                           Context context) {
-    SupplementalInfoRetriever retriever = null;
+
+    Collection<SupplementalInfoRetriever> retrievers = new ArrayList<SupplementalInfoRetriever>(1);
+
     if (result instanceof URIParsedResult) {
-      retriever = new URIResultInfoRetriever(textView, (URIParsedResult) result, handler, historyManager, context);
+      retrievers.add(new URIResultInfoRetriever(textView, (URIParsedResult) result, handler, historyManager, context));
     } else if (result instanceof ProductParsedResult) {
-      retriever = new ProductResultInfoRetriever(textView,
-                                                 ((ProductParsedResult) result).getProductID(),
-                                                 handler,
-                                                 historyManager,
-                                                 context);
+      String productID = ((ProductParsedResult) result).getProductID();
+      retrievers.add(new ProductResultInfoRetriever(textView, productID, handler, historyManager, context));
     } else if (result instanceof ISBNParsedResult) {
-      retriever = new ProductResultInfoRetriever(textView,
-                                                 ((ISBNParsedResult) result).getISBN(),
-                                                 handler,
-                                                 historyManager,
-                                                 context);
+      String isbn = ((ISBNParsedResult) result).getISBN();
+      retrievers.add(new ProductResultInfoRetriever(textView, isbn, handler, historyManager, context));
+      retrievers.add(new BookResultInfoRetriever(textView, isbn, handler, historyManager, context));
     }
-    if (retriever != null) {
+
+    for (SupplementalInfoRetriever retriever : retrievers) {
       ExecutorService executor = getExecutorService();
       Future<?> future = executor.submit(retriever);
       // Make sure it's interrupted after a short time though
@@ -86,13 +95,11 @@ public abstract class SupplementalInfoRetriever implements Callable<Void> {
 
   private final WeakReference<TextView> textViewRef;
   private final Handler handler;
-  private final Context context;
   private final HistoryManager historyManager;
 
-  SupplementalInfoRetriever(TextView textView, Handler handler, HistoryManager historyManager, Context context) {
+  SupplementalInfoRetriever(TextView textView, Handler handler, HistoryManager historyManager) {
     this.textViewRef = new WeakReference<TextView>(textView);
     this.handler = handler;
-    this.context = context;
     this.historyManager = historyManager;
   }
 
@@ -103,28 +110,90 @@ public abstract class SupplementalInfoRetriever implements Callable<Void> {
 
   abstract void retrieveSupplementalInfo() throws IOException, InterruptedException;
 
-  final void append(String itemID, final String newText) throws InterruptedException {
+  final void append(String itemID, String source, String[] newTexts, String linkURL) throws InterruptedException {
+
     final TextView textView = textViewRef.get();
     if (textView == null) {
       throw new InterruptedException();
     }
+
+    StringBuilder newTextCombined = new StringBuilder();
+
+    if (source != null) {
+      newTextCombined.append(source).append('\n');
+    }
+
+    int spanStart = newTextCombined.length();
+
+    boolean first = true;
+    for (String newText : newTexts) {
+      if (first) {
+        newTextCombined.append(newText);
+        first = false;
+      } else {
+        newTextCombined.append(" [");
+        newTextCombined.append(newText);
+        newTextCombined.append(']');
+      }
+    }
+
+    int spanEnd = newTextCombined.length();
+
+    newTextCombined.append("\n\n");
+
+    String newText = newTextCombined.toString();
+    final Spannable content = new SpannableString(newText);
+    if (linkURL != null) {
+      content.setSpan(new URLSpan(linkURL), spanStart, spanEnd, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+    }
+
     handler.post(new Runnable() {
       public void run() {
-        textView.append(Html.fromHtml(newText + '\n'));
+        textView.append(content);
+        textView.setMovementMethod(LinkMovementMethod.getInstance());
       }
     });
+
     // Add the text to the history.
     historyManager.addHistoryItemDetails(itemID, newText);
   }
 
-  final void setLink(final String uri) {
-    textViewRef.get().setOnClickListener(new View.OnClickListener() {
-      public void onClick(View view) {
-        Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(uri));
-        intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET);
-        context.startActivity(intent);
+  protected static String downloadViaHttp(String uri) throws IOException {
+    HttpUriRequest get = new HttpGet(uri);
+    AndroidHttpClient client = AndroidHttpClient.newInstance(null);
+    HttpResponse response = client.execute(get);
+    int status = response.getStatusLine().getStatusCode();
+    if (status != 200) {
+      throw new IOException();
+    }
+    return consume(response.getEntity());
+  }
+
+  private static String consume(HttpEntity entity) throws IOException {
+    ByteArrayOutputStream out = new ByteArrayOutputStream();
+    InputStream in = null;
+    try {
+      in = entity.getContent();
+      byte[] buffer = new byte[1024];
+      int bytesRead;
+      while ((bytesRead = in.read(buffer)) > 0) {
+        out.write(buffer, 0, bytesRead);
       }
-    });
+    } finally {
+      if (in != null) {
+        try {
+          in.close();
+        } catch (IOException ioe) {
+          // continue
+        }
+      }
+    }
+    try {
+      return new String(out.toByteArray(), "UTF-8");
+    } catch (UnsupportedEncodingException uee) {
+      // can't happen
+      throw new IllegalStateException(uee);
+    }
   }
 
 }
diff --git a/android/src/com/google/zxing/client/android/result/supplement/URIResultInfoRetriever.java b/android/src/com/google/zxing/client/android/result/supplement/URIResultInfoRetriever.java
index d4f0b972c..08cf74024 100644
--- a/android/src/com/google/zxing/client/android/result/supplement/URIResultInfoRetriever.java
+++ b/android/src/com/google/zxing/client/android/result/supplement/URIResultInfoRetriever.java
@@ -48,7 +48,7 @@ final class URIResultInfoRetriever extends SupplementalInfoRetriever {
                          Handler handler,
                          HistoryManager historyManager,
                          Context context) {
-    super(textView, handler, historyManager, context);
+    super(textView, handler, historyManager);
     redirectString = context.getString(R.string.msg_redirect);
     this.result = result;
   }
@@ -59,12 +59,11 @@ final class URIResultInfoRetriever extends SupplementalInfoRetriever {
     String newURI = unredirect(oldURI);
     int count = 0;
     while (count < 3 && !oldURI.equals(newURI)) {
-      append(result.getDisplayResult(), redirectString + " : " + newURI);
+      append(result.getDisplayResult(), null, new String[] { redirectString + " : " + newURI }, newURI);
       count++;
       oldURI = newURI;
       newURI = unredirect(newURI);
     }
-    setLink(newURI);
   }
 
   private static String unredirect(String uri) throws IOException {