@@ -, +, @@ 
---
 src/scroll.c |   42 ++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 40 insertions(+), 2 deletions(-)
--- a/src/scroll.c	
+++ a/src/scroll.c	
@@ -34,12 +34,33 @@ 
 
 struct scroll_data {
 	char *text;
+	unsigned int show_orig;
 	unsigned int show;
 	unsigned int step;
 	unsigned int start;
 	long resetcolor;
 };
 
+int utf8_charlen(char c) {
+	unsigned char uc = (unsigned char) c;
+	int len = 0;
+
+	if ((uc & 0x80) == 0)
+		return 1;
+
+	while ((uc & 0x80) != 0) {
+		++len;
+		uc <<= 1;
+	}
+
+	return (len > 0 && len <= 4) ? len : -1;
+}
+
+int is_utf8_char_tail(char c) {
+	unsigned char uc = (unsigned char) c;
+	return (uc & 0xc0) == 0x80;
+}
+
 void parse_scroll_arg(struct text_object *obj, const char *arg, void *free_at_crash)
 {
 	struct scroll_data *sd;
@@ -60,15 +81,16 @@ void parse_scroll_arg(struct text_object *obj, const char *arg, void *free_at_cr
 		sd->step = 1;
 	}
 	sd->text = malloc(strlen(arg + n1) + sd->show + 1);
+	sd->show_orig = sd->show;
 
 	if (strlen(arg) > sd->show) {
 		for(n2 = 0; (unsigned int) n2 < sd->show; n2++) {
-		    sd->text[n2] = ' ';
+			sd->text[n2] = ' ';
 		}
 		sd->text[n2] = 0;
 	}
 	else
-	    sd->text[0] = 0;
+		sd->text[0] = 0;
 
 	strcat(sd->text, arg + n1);
 	sd->start = 0;
@@ -82,6 +104,8 @@ void print_scroll(struct text_object *obj, char *p, int p_max_size, struct infor
 {
 	struct scroll_data *sd = obj->data.opaque;
 	unsigned int j, colorchanges = 0, frontcolorchanges = 0, visibcolorchanges = 0, strend;
+	int charlen = 0;
+	unsigned int utf8lenfix = 0;
 	char *pwithcolors;
 	char buf[max_user_text];
 
@@ -109,6 +133,10 @@ void print_scroll(struct text_object *obj, char *p, int p_max_size, struct infor
 	while(*(buf + sd->start) == SPECIAL_CHAR) {
 		sd->start++;
 	}
+	//skip parts of UTF-8 character which messes up display
+	while(is_utf8_char_tail(*(buf + sd->start))) {
+		sd->start++;
+	}
 	//place all chars that should be visible in p, including colorchanges
 	for(j=0; j < sd->show + visibcolorchanges; j++) {
 		p[j] = *(buf + sd->start + j);
@@ -117,7 +145,17 @@ void print_scroll(struct text_object *obj, char *p, int p_max_size, struct infor
 		}
 		//if there is still room fill it with spaces
 		if( ! p[j]) break;
+
+		charlen = utf8_charlen(p[j]);
+		if(charlen > 1 && charlen - 1 > sd->show + visibcolorchanges - j - 1) {
+			//if the rest is a part of UTF-8 character fill that with spaces instead
+			break;
+		} else {
+			//count visible length deficiency caused by UTF-8 chars
+			utf8lenfix += (charlen > 1 ? charlen - 1 : 0);
+		}
 	}
+	sd->show = sd->show_orig + utf8lenfix;
 	for(; j < sd->show + visibcolorchanges; j++) {
 		p[j] = ' ';
 	}
--