--- newStack1_1_4/sendmail.c	2008-12-01 12:15:20.000000000 +0100
+++ newStack1_1_5/sendmail.c	2009-01-11 16:14:02.000000000 +0100
@@ -61,7 +61,7 @@
     
     if (mail_get)
     {
-        unsigned char mail_auth_str[35];
+        char mail_auth_str[35];
         unsigned int message_code = 0; 
         
 		message_code = atol((char*)&eth_buffer[TCP_DATA_START_VAR]);
@@ -119,15 +119,15 @@
                 if (message_code == 334)
                 {
                     MAIL_DEBUG("2: Send Username: ");
-                    decode_base64((unsigned char*)SMTP_USERNAME,mail_auth_str);
+                    decode_base64((unsigned char*)SMTP_USERNAME,(unsigned char*)mail_auth_str);
                     MAIL_DEBUG("%s",mail_auth_str);
                     MAIL_DEBUG("\r\n");
                     
-                    memcpy(&eth_buffer[TCP_DATA_START_VAR],mail_auth_str,sizeof(mail_auth_str));
-                    memcpy_P(&eth_buffer[TCP_DATA_START_VAR+sizeof(mail_auth_str)-1],PSTR("\r\n"),2);
+                    memcpy(&eth_buffer[TCP_DATA_START_VAR],mail_auth_str,strlen(mail_auth_str)+1);
+                    memcpy_P(&eth_buffer[TCP_DATA_START_VAR+strlen(mail_auth_str)],PSTR("\r\n"),2);
                     
                     tcp_entry[index].status = ACK_FLAG | PSH_FLAG;
-                    create_new_tcp_packet(sizeof(mail_auth_str)+1,index);   
+                    create_new_tcp_packet(strlen(mail_auth_str)+2,index);   
                     mail_send_counter++;  
                 }
                 break;
@@ -136,16 +136,16 @@
                 if (message_code == 334)
                 {
                     MAIL_DEBUG("3: Send Password: ");
-                    decode_base64((unsigned char*)SMTP_PASSWORD,mail_auth_str);
+                    decode_base64((unsigned char*)SMTP_PASSWORD,(unsigned char*)mail_auth_str);
                     MAIL_DEBUG("%s",mail_auth_str);
                     MAIL_DEBUG("\r\n");
                     
-                    memcpy(&eth_buffer[TCP_DATA_START_VAR],mail_auth_str,sizeof(mail_auth_str));
-                    memcpy_P(&eth_buffer[TCP_DATA_START_VAR+sizeof(mail_auth_str)-1],PSTR("\r\n"),2);
+                    memcpy(&eth_buffer[TCP_DATA_START_VAR],mail_auth_str,strlen(mail_auth_str)+1);
+                    memcpy_P(&eth_buffer[TCP_DATA_START_VAR+strlen(mail_auth_str)],PSTR("\r\n"),2);
                     
                     
                     tcp_entry[index].status = ACK_FLAG | PSH_FLAG;
-                    create_new_tcp_packet(sizeof(mail_auth_str)+1,index);   
+                    create_new_tcp_packet(strlen(mail_auth_str)+2,index);   
                     mail_send_counter++;  
                 }
                 break;
