diff --git a/koha-tmpl/opac-tmpl/css/en/opac-sendbasket.tmpl b/koha-tmpl/opac-tmpl/css/en/opac-sendbasket.tmpl
index 996520e421..ddca193b64 100644
--- a/koha-tmpl/opac-tmpl/css/en/opac-sendbasket.tmpl
+++ b/koha-tmpl/opac-tmpl/css/en/opac-sendbasket.tmpl
@@ -4,7 +4,7 @@ Your biblio basket
 
 <HEADER>
 Hi,
-Here is your biblio basket...
+Here is the biblio basket sent by <!-- TMPL_VAR name="email_sender" -->
 <END_HEADER>
 
 <FILENAME>
@@ -13,7 +13,7 @@ basket.txt
 
 <MESSAGE>
 ---------------------------------------------
-<!-- TMPL_LOOP NAME="BIBLIO_RESULTS" --><!-- TMPL_VAR NAME="title" -->(record <!-- TMPL_VAR NAME="biblionumber" -->)<!-- TMPL_IF name="isbn" -->
+<!-- TMPL_LOOP NAME="BIBLIO_RESULTS" --><!-- TMPL_VAR NAME="title" --> <!-- TMPL_IF name="isbn" -->
 ISBN:		<!-- TMPL_VAR NAME="ISBN" --><!-- /TMPL_IF --><!-- TMPL_IF name="subtitle" -->
 Subtitle:		<!-- TMPL_VAR NAME="subtitle" --><!-- /TMPL_IF --><!-- TMPL_IF name="author" -->
 Author:	<!-- TMPL_VAR NAME="author" --><!-- /TMPL_IF --><!-- TMPL_IF name="additional" -->
diff --git a/koha-tmpl/opac-tmpl/css/en/opac-sendbasketform.tmpl b/koha-tmpl/opac-tmpl/css/en/opac-sendbasketform.tmpl
index 320432685d..7d6c6566a9 100644
--- a/koha-tmpl/opac-tmpl/css/en/opac-sendbasketform.tmpl
+++ b/koha-tmpl/opac-tmpl/css/en/opac-sendbasketform.tmpl
@@ -10,13 +10,9 @@
 	<!-- /TMPL_IF -->
 <!-- TMPL_ELSE -->
 <form action="<!-- TMPL_VAR NAME="url" -->" method="post">
-	<TABLE style="border:0;">
-		<TR><TD style="border:0;"><b>E-mail address</b></TD>
-		<TD style="border:0;"><input name="email_add" size="25" /></TD></TR>
-		<TR><TD colspan="2" style="border:0;">&nbsp;</TD>
-		<TR><TD style="border:0;"></TD>
-		<TD style="border:0;text-align:right;"><input type="submit" value="Send" class="button" /></TD></TR>
-	</TABLE>
+	<p><label>mail sent by</label><input name="email_sender" size="25" /></p>
+	<p><label>E-mail address</label><input name="email_add" size="25" /></p>
+	<p><label>&nbsp;</label><input type="submit" value="Send" class="button" /></p>
 	<input type='hidden' name="bib_list" value="<!-- TMPL_VAR NAME="bib_list" -->" />
 </form>
 <!-- /TMPL_IF -->
diff --git a/opac/opac-sendbasket.pl b/opac/opac-sendbasket.pl
index ca678e5b2c..32812df986 100755
--- a/opac/opac-sendbasket.pl
+++ b/opac/opac-sendbasket.pl
@@ -23,6 +23,7 @@ my ($template, $borrowernumber, $cookie)
 
 my $bib_list=$query->param('bib_list');
 my $email_add=$query->param('email_add');
+my $email_sender=$query->param('email_sender');
 
 if ($email_add) {
 	my $email_from = C4::Context->preference('KohaAdminEmailAddress');
@@ -58,7 +59,8 @@ if ($email_add) {
 	}
 
 	my $resultsarray=\@results;
-	$template2->param(BIBLIO_RESULTS => $resultsarray);
+	$template2->param(BIBLIO_RESULTS => $resultsarray,
+					email_sender => $email_sender);
 
 	# Getting template result
 	my $template_res = $template2->output();